Issue #1158 - removed unnecessary definitions and #ifdef/#else/#endif sections

src/plugin/PluginClass.h

Index: src/plugin/PluginClass.h
===================================================================
--- a/src/plugin/PluginClass.h
+++ b/src/plugin/PluginClass.h
@@ -22,12 +22,7 @@
 #define ICON_MAX 3
 
 #define WM_LAUNCH_INFO					(WM_APP + 10)
-
-#ifdef SUPPORT_WHITELIST
 #define WM_WHITELIST_DOMAIN		        (WM_LAUNCH_INFO + 1)

[Oleksandr, 2014/10/02 21:24:02]

WM_WHITELIST_DOMAIN isn't used anymore

-#else
-#define WM_GROUP2_START                    (WM_LAUNCH_INFO + 1)
-#endif
 
 class CPluginMimeFilterClient;
 
@@ -165,27 +160,18 @@
   static HANDLE GetMainThreadHandle();
   static bool IsMainThreadDone(HANDLE mainThread);
 
-
   static HINSTANCE s_hUxtheme;
   static std::set<CPluginClass*> s_instances;
   static std::map<DWORD,CPluginClass*> s_threadInstances;
-
-#ifdef SUPPORT_WHITELIST
   static std::map<UINT, CString> s_menuDomains;

[Oleksandr, 2014/10/02 21:24:02]

Looks like we can remove s_menuDomains as well.

-#endif
-
   static CComAutoCriticalSection s_criticalSectionLocal;
   static CComAutoCriticalSection s_criticalSectionBrowser;
   static CComAutoCriticalSection s_criticalSectionWindow;
-#ifdef SUPPORT_WHITELIST
   static CComAutoCriticalSection s_criticalSectionWhiteList;

[Oleksandr, 2014/10/02 21:24:02]

s_criticalSectionWhiteList is unused.

-#endif
 
   // Async browser
   static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2;
-
   static CComQIPtr<IWebBrowser2> GetAsyncBrowser();
-
 };
 
 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass)