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

Delta Between Two Patch Sets: src/plugin/PluginUserSettings.cpp

Issue 5024350814076928: Issue 1103 - Migrate Simple Adblock users
Left Patch Set: Make it less Simple Adblock specific, and add the FRP changes Created April 16, 2015, 9:52 a.m.
Right Patch Set: Use registry instead of prefs for storing the Simple Adblock mark Created Aug. 7, 2015, 10:34 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include "PluginStdAfx.h" 18 #include "PluginStdAfx.h"
19 #include "PluginUserSettings.h" 19 #include "PluginUserSettings.h"
20 #include <algorithm> 20 #include "AdblockPlusClient.h"
21 #include "PluginSettings.h" 21 #include "PluginSettings.h"
22 #include "PluginClient.h"
23 #include "../shared/Dictionary.h" 22 #include "../shared/Dictionary.h"
24 #include <unordered_map> 23 #include <unordered_map>
25 24
26 namespace 25 namespace
27 { 26 {
28 enum UserSettingsMethods 27 enum UserSettingsMethods
29 { 28 {
30 dispatchID_GetMessage = 0, 29 dispatchID_GetMessage = 0,
31 dispatchID_GetLanguageCount, 30 dispatchID_GetLanguageCount,
32 dispatchID_GetLanguageByIndex, 31 dispatchID_GetLanguageByIndex,
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 break; 445 break;
447 case dispatchID_GetConversion: 446 case dispatchID_GetConversion:
448 { 447 {
449 if (pDispparams->cArgs != 0) 448 if (pDispparams->cArgs != 0)
450 { 449 {
451 return DISP_E_BADPARAMCOUNT; 450 return DISP_E_BADPARAMCOUNT;
452 } 451 }
453 if (pVarResult) 452 if (pVarResult)
454 { 453 {
455 pVarResult->vt = VT_BSTR; 454 pVarResult->vt = VT_BSTR;
456 pVarResult->bstrVal = CComBSTR(CPluginClient::GetInstance()->GetPref(s td::wstring(L"convertedFrom"), std::wstring(L"")).c_str()); 455 pVarResult->bstrVal = CComBSTR(CPluginClient::GetInstance()->GetConver tedFrom().c_str());
457 } 456 }
458 } 457 }
459 break; 458 break;
460 default: 459 default:
461 return DISP_E_MEMBERNOTFOUND; 460 return DISP_E_MEMBERNOTFOUND;
462 break; 461 break;
463 } 462 }
464 } 463 }
465 catch (...) 464 catch (...)
466 { 465 {
467 return E_FAIL; 466 return E_FAIL;
468 } 467 }
469 return S_OK; 468 return S_OK;
470 } 469 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld