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

Side by Side Diff: src/plugin/PluginClass.cpp

Issue 5137721374801920: Issue #1173 - Default behavior for catch-all blocks
Patch Set: rebase + nit Created March 20, 2015, 9:36 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 | « src/plugin/Exception.h ('k') | src/plugin/PluginDebug.h » ('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 <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
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 644
645 // Entry point 645 // Entry point
646 void STDMETHODCALLTYPE CPluginClass::OnOnQuit() 646 void STDMETHODCALLTYPE CPluginClass::OnOnQuit()
647 { 647 {
648 try 648 try
649 { 649 {
650 Unadvise(); 650 Unadvise();
651 } 651 }
652 catch (...) 652 catch (...)
653 { 653 {
654 EntryPointExceptionDefault("CPluginClass::Invoke");
655
654 } 656 }
655 } 657 }
656 658
657 bool CPluginClass::InitObject(bool bBHO) 659 bool CPluginClass::InitObject(bool bBHO)
658 { 660 {
659 DEBUG_GENERAL("InitObject"); 661 DEBUG_GENERAL("InitObject");
660 CPluginSettings* settings = CPluginSettings::GetInstance(); 662 CPluginSettings* settings = CPluginSettings::GetInstance();
661 663
662 if (!settings->GetPluginEnabled()) 664 if (!settings->GetPluginEnabled())
663 { 665 {
(...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after
1758 s_criticalSectionLocal.Unlock(); 1760 s_criticalSectionLocal.Unlock();
1759 1761
1760 } 1762 }
1761 } 1763 }
1762 } 1764 }
1763 1765
1764 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); 1766 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
1765 } 1767 }
1766 return hTabWnd; 1768 return hTabWnd;
1767 } 1769 }
OLDNEW
« no previous file with comments | « src/plugin/Exception.h ('k') | src/plugin/PluginDebug.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld