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

Side by Side Diff: src/engine/main.cpp

Issue 10948032: Fix domain-based whitelisting (Closed)
Patch Set: Created June 14, 2013, 2:44 p.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 | « no previous file | src/plugin/AdblockPlusClient.h » ('j') | src/plugin/PluginClientBase.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include <AdblockPlus.h> 1 #include <AdblockPlus.h>
2 #include <functional> 2 #include <functional>
3 #include <vector> 3 #include <vector>
4 #include <Windows.h> 4 #include <Windows.h>
5 5
6 #include "../shared/AutoHandle.h" 6 #include "../shared/AutoHandle.h"
7 #include "../shared/Communication.h" 7 #include "../shared/Communication.h"
8 #include "../shared/Dictionary.h" 8 #include "../shared/Dictionary.h"
9 #include "../shared/Utils.h" 9 #include "../shared/Utils.h"
10 #include "../shared/Version.h" 10 #include "../shared/Version.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 break; 121 break;
122 } 122 }
123 case Communication::PROC_ADD_FILTER: 123 case Communication::PROC_ADD_FILTER:
124 { 124 {
125 std::string text; 125 std::string text;
126 request >> text; 126 request >> text;
127 127
128 filterEngine->GetFilter(text)->AddToList(); 128 filterEngine->GetFilter(text)->AddToList();
129 break; 129 break;
130 } 130 }
131 case Communication::PROC_REMOVE_FILTER:
132 {
133 std::string text;
134 request >> text;
135 filterEngine->GetFilter(text)->RemoveFromList();
136 break;
137 }
131 } 138 }
132 return response; 139 return response;
133 } 140 }
134 141
135 DWORD WINAPI ClientThread(LPVOID param) 142 DWORD WINAPI ClientThread(LPVOID param)
136 { 143 {
137 std::auto_ptr<Communication::Pipe> pipe(static_cast<Communication::Pipe*>(pa ram)); 144 std::auto_ptr<Communication::Pipe> pipe(static_cast<Communication::Pipe*>(pa ram));
138 145
139 try 146 try
140 { 147 {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 } 239 }
233 catch (std::runtime_error e) 240 catch (std::runtime_error e)
234 { 241 {
235 DebugException(e); 242 DebugException(e);
236 return 1; 243 return 1;
237 } 244 }
238 } 245 }
239 246
240 return 0; 247 return 0;
241 } 248 }
OLDNEW
« no previous file with comments | « no previous file | src/plugin/AdblockPlusClient.h » ('j') | src/plugin/PluginClientBase.cpp » ('J')

Powered by Google App Engine
This is Rietveld