Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: shell/src/Main.cpp

Issue 11157034: Update info module and make updater use the new downloader module (Closed)
Patch Set: Created July 23, 2013, 10:03 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « libadblockplus.gyp ('k') | src/AppInfoJsObject.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2013 Eyeo GmbH 3 * Copyright (C) 2006-2013 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 } 52 }
53 53
54 int main() 54 int main()
55 { 55 {
56 try 56 try
57 { 57 {
58 AdblockPlus::AppInfo appInfo; 58 AdblockPlus::AppInfo appInfo;
59 appInfo.version = "1.0"; 59 appInfo.version = "1.0";
60 appInfo.name = "abpshell"; 60 appInfo.name = "abpshell";
61 appInfo.platform = "standalone"; 61 appInfo.application = "standalone";
62 appInfo.applicationVersion = "1.0";
62 appInfo.locale = "en-US"; 63 appInfo.locale = "en-US";
63 AdblockPlus::JsEnginePtr jsEngine(AdblockPlus::JsEngine::New(appInfo)); 64 AdblockPlus::JsEnginePtr jsEngine(AdblockPlus::JsEngine::New(appInfo));
64 AdblockPlus::FilterEngine filterEngine(jsEngine); 65 AdblockPlus::FilterEngine filterEngine(jsEngine);
65 66
66 CommandMap commands; 67 CommandMap commands;
67 Add(commands, new GcCommand(jsEngine)); 68 Add(commands, new GcCommand(jsEngine));
68 Add(commands, new HelpCommand(commands)); 69 Add(commands, new HelpCommand(commands));
69 Add(commands, new FiltersCommand(filterEngine)); 70 Add(commands, new FiltersCommand(filterEngine));
70 Add(commands, new SubscriptionsCommand(filterEngine)); 71 Add(commands, new SubscriptionsCommand(filterEngine));
71 Add(commands, new MatchesCommand(filterEngine)); 72 Add(commands, new MatchesCommand(filterEngine));
(...skipping 18 matching lines...) Expand all
90 std::cout << error.what() << std::endl; 91 std::cout << error.what() << std::endl;
91 } 92 }
92 } 93 }
93 } 94 }
94 catch (const std::exception& e) 95 catch (const std::exception& e)
95 { 96 {
96 std::cerr << "Exception: " << e.what() << std::endl; 97 std::cerr << "Exception: " << e.what() << std::endl;
97 } 98 }
98 return 0; 99 return 0;
99 } 100 }
OLDNEW
« no previous file with comments | « libadblockplus.gyp ('k') | src/AppInfoJsObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld