[IE] First round of ATL removal

src/plugin/PluginClass.h

Index: src/plugin/PluginClass.h
===================================================================
--- a/src/plugin/PluginClass.h
+++ b/src/plugin/PluginClass.h
@@ -14,6 +14,7 @@
 #include <crtdbg.h>
 
 #include "NotificationMessage.h"
+#include "Wrapper.h"
 
 #define ICON_PLUGIN_DISABLED 0
 #define ICON_PLUGIN_ENABLED 1
@@ -86,8 +87,8 @@
 
 private:
 
-  bool SetMenuBar(HMENU hMenu, const CString& url);
-  HMENU CreatePluginMenu(const CString& url);
+  bool SetMenuBar(HMENU hMenu, const std::wstring & url);
+  HMENU CreatePluginMenu(const std::wstring & url);
 
   void DisplayPluginMenu(HMENU hMenu, int nToolbarCmdID, POINT pt, UINT nMenuFlags);
   bool CreateStatusBarPane();
@@ -105,8 +106,12 @@
   static CPluginMimeFilterClient* s_mimeFilter;
 
 private:
+  Wrapper::Browser browser() const
+  {
+    return Wrapper::Browser( GetBrowser() );
+  }
 
-  CString GetBrowserUrl() const;
+  std::wstring GetBrowserUrl() const;
 
 
   static DWORD WINAPI StartInitObject(LPVOID thisPtr);
@@ -114,7 +119,7 @@
   void CloseTheme();
   void UpdateTheme();
 
-  static HICON GetStatusBarIcon(const CString& url);
+  static HICON GetStatusBarIcon(const std::wstring & url);
   static CPluginClass* FindInstance(HWND hStatusBarWnd);
   static LRESULT CALLBACK NewStatusProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
   static LRESULT CALLBACK PaneWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
@@ -170,7 +175,7 @@
   static std::map<DWORD,CPluginClass*> s_threadInstances;
 
 #ifdef SUPPORT_WHITELIST
-  static std::map<UINT, CString> s_menuDomains;
+  static std::map<UINT, std::wstring> s_menuDomains;
 #endif
 
   static CComAutoCriticalSection s_criticalSectionLocal;