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

Unified Diff: src/plugin/PluginClass.cpp

Issue 5558809044975616: Noissue - Dead code removal (Closed)
Patch Set: Created Oct. 7, 2014, 3:56 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/plugin/PluginClass.h ('k') | src/plugin/PluginStdAfx.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/plugin/PluginClass.cpp
===================================================================
--- a/src/plugin/PluginClass.cpp
+++ b/src/plugin/PluginClass.cpp
@@ -42,7 +42,6 @@
CComAutoCriticalSection CPluginClass::s_criticalSectionWindow;
CComQIPtr<IWebBrowser2> CPluginClass::s_asyncWebBrowser2;
-std::map<UINT,CString> CPluginClass::s_menuDomains;
/*
* Without namespace declaration, the identifier "Rectangle" is ambiguous
@@ -1382,13 +1381,6 @@
DEBUG_GENERAL("SetMenuBar");
std::wstring ctext;
-
- s_criticalSectionLocal.Lock();
- {
- s_menuDomains.clear();
- }
- s_criticalSectionLocal.Unlock();
-
Dictionary* dictionary = Dictionary::GetInstance();
MENUITEMINFOW fmii;
@@ -1631,17 +1623,17 @@
if (tab)
{
CPluginClient* client = CPluginClient::GetInstance();
- if (!CPluginSettings::GetInstance()->IsPluginEnabled())
+ if (CPluginSettings::GetInstance()->IsPluginEnabled())
{
- }
- else if (client->IsWhitelistedUrl(to_wstring(url)))
- {
- hIcon = GetIcon(ICON_PLUGIN_DISABLED);
- }
- else
- {
- CPluginSettings* settings = CPluginSettings::GetInstance();
- hIcon = GetIcon(ICON_PLUGIN_ENABLED);
+ if (client->IsWhitelistedUrl(to_wstring(url)))
+ {
+ hIcon = GetIcon(ICON_PLUGIN_DISABLED);
+ }
+ else
+ {
+ CPluginSettings* settings = CPluginSettings::GetInstance();
+ hIcon = GetIcon(ICON_PLUGIN_ENABLED);
+ }
}
}
return hIcon;
« no previous file with comments | « src/plugin/PluginClass.h ('k') | src/plugin/PluginStdAfx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld