Noissue - Dead code removal

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
@@ skipping 24 matching lines @@
 ATOM CPluginClass::s_atomPaneClass = NULL;
 HINSTANCE CPluginClass::s_hUxtheme = NULL;
 std::set<CPluginClass*> CPluginClass::s_instances;
 std::map<DWORD, CPluginClass*> CPluginClass::s_threadInstances;
 
 CComAutoCriticalSection CPluginClass::s_criticalSectionLocal;
 CComAutoCriticalSection CPluginClass::s_criticalSectionBrowser;
 CComAutoCriticalSection CPluginClass::s_criticalSectionWindow;
 
 CComQIPtr<IWebBrowser2> CPluginClass::s_asyncWebBrowser2;
-std::map<UINT,CString> CPluginClass::s_menuDomains;
 
 /*
  * Without namespace declaration, the identifier "Rectangle" is ambiguous
  * See http://msdn.microsoft.com/en-us/library/windows/desktop/dd162898(v=vs.85).aspx
  */
 namespace AdblockPlus
 {
   /**
     * Replacement for ATL type CRect.
     */
@@ skipping 1319 matching lines @@
   // Invalidate and redraw the control
   UpdateStatusBar();
 }
 
 
 bool CPluginClass::SetMenuBar(HMENU hMenu, const CString& url)
 {
   DEBUG_GENERAL("SetMenuBar");
 
   std::wstring ctext;
-
-  s_criticalSectionLocal.Lock();
-  {
-    s_menuDomains.clear();
-  }
-  s_criticalSectionLocal.Unlock();
-
   Dictionary* dictionary = Dictionary::GetInstance();
 
   MENUITEMINFOW fmii;
   memset(&fmii, 0, sizeof(MENUITEMINFO));
   fmii.cbSize = sizeof(MENUITEMINFO);
 
   MENUITEMINFOW miiSep;
   memset(&miiSep, 0, sizeof(MENUITEMINFO));
   miiSep.cbSize = sizeof(MENUITEMINFO);
   miiSep.fMask = MIIM_TYPE | MIIM_FTYPE;
@@ skipping 222 matching lines @@
 
 HICON CPluginClass::GetStatusBarIcon(const CString& url)
 {
   // use the disable icon as defualt, if the client doesn't exists
   HICON hIcon = GetIcon(ICON_PLUGIN_DEACTIVATED);
 
   CPluginTab* tab = GetTab(::GetCurrentThreadId());
   if (tab)
   {
     CPluginClient* client = CPluginClient::GetInstance();
-    if (!CPluginSettings::GetInstance()->IsPluginEnabled())
-    {
-    }
-    else if (client->IsWhitelistedUrl(std::wstring(url)))
+    if (client->IsWhitelistedUrl(std::wstring(url)))

[Oleksandr, 2014/10/03 08:19:59]

This should still run only if plugin is enabled. I must've miss communicated
what can be removed. Only the empty 'if' block is weird here. Should be 
if (CPluginSettings::GetInstance()->IsPluginEnabled())
{
  if (client->IsWhitelistedUrl(...))
  {
  }
  else
   ...
}

[Eric, 2014/10/07 15:57:49]

Done.

     {
       hIcon = GetIcon(ICON_PLUGIN_DISABLED);
     }
     else
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
       hIcon = GetIcon(ICON_PLUGIN_ENABLED);
     }
   }
   return hIcon;
@@ skipping 327 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }