[IE] First round of ATL removal

src/plugin/PluginClass.h

 /*
 * http://msdn.microsoft.com/en-us/library/bb250436.aspx
 */
 
 #ifndef _PLUGIN_CLASS_H_
 #define _PLUGIN_CLASS_H_
 
 
 #include "PluginTypedef.h"
 #include "Plugin.h"
 #include "PluginTab.h"
 #define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
 #include <crtdbg.h>
 
 #include "NotificationMessage.h"
+#include "Wrapper.h"
 
 #define ICON_PLUGIN_DISABLED 0
 #define ICON_PLUGIN_ENABLED 1
 #define ICON_PLUGIN_DEACTIVATED 2
 #define ICON_MAX 3
 
 #define WM_LAUNCH_INFO                                  (WM_APP + 10)
 
 #ifdef SUPPORT_WHITELIST
 #define WM_WHITELIST_DOMAIN                     (WM_LAUNCH_INFO + 1)
@@ skipping 52 matching lines @@
     DISPPARAMS * pdispparams, VARIANT * pvarResult,EXCEPINFO * pexcepinfo, UINT * puArgErr);
 
   static CPluginTab* GetTab(DWORD dwThreadId);
   CPluginTab* GetTab();
 
   void UpdateStatusBar();
   static DWORD WINAPI MainThreadProc(LPVOID pParam);
 
 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();
 
   CComPtr<IConnectionPoint> GetConnectionPoint();
   CComPtr<IConnectionPoint> GetConnectionPointPropSink();
 
 public:
   HWND GetBrowserHWND() const;
   HWND GetTabHWND() const;
   CComQIPtr<IWebBrowser2> GetBrowser() const;
 
   STDMETHODIMP OnTabChanged(DISPPARAMS* pDispParams, WORD wFlags);
 
   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);
   bool InitObject(bool bBHO);
   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);
   static void FirstRunThread();
   void BeforeNavigate2(DISPPARAMS* pDispParams);
 
   void Unadvice();
 
   void ShowStatusBar();
   bool IsStatusBarEnabled();
@@ skipping 35 matching lines @@
 
   static HANDLE GetMainThreadHandle();
   static bool IsMainThreadDone(HANDLE mainThread);
 
 
   static HINSTANCE s_hUxtheme;
   static CSimpleArray<CPluginClass*> s_instances;
   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;
   static CComAutoCriticalSection s_criticalSectionBrowser;
   static CComAutoCriticalSection s_criticalSectionWindow;
 #ifdef SUPPORT_WHITELIST
   static CComAutoCriticalSection s_criticalSectionWhiteList;
 #endif
 
   // Async browser
   static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2;
 
   static CComQIPtr<IWebBrowser2> GetAsyncBrowser();
 
 };
 
 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass)
 
 
 #endif // _PLUGIN_CLASS_H_