diff --git a/bazaar/ChromiumBrowser/ChromiumBrowser.cpp b/bazaar/ChromiumBrowser/ChromiumBrowser.cpp index 75098c1aa..17bb233d2 100644 --- a/bazaar/ChromiumBrowser/ChromiumBrowser.cpp +++ b/bazaar/ChromiumBrowser/ChromiumBrowser.cpp @@ -145,7 +145,7 @@ void ChromiumBrowser::State(int reason) void ChromiumBrowser::AfterInit() { - WhenGotFocus = THISBACK(SetFocus2); + WhenGotFocus = LAMBDA(){ SetFocus(); }; handler = new ClientHandler(WhenUrlChange, WhenStatus, WhenMessage, WhenTakeFocus, WhenGotFocus, WhenKeyboard, WhenConsoleMessage); diff --git a/bazaar/ChromiumBrowser/ChromiumBrowser.h b/bazaar/ChromiumBrowser/ChromiumBrowser.h index 0a772433e..39bec3f39 100644 --- a/bazaar/ChromiumBrowser/ChromiumBrowser.h +++ b/bazaar/ChromiumBrowser/ChromiumBrowser.h @@ -23,7 +23,6 @@ private: void BeforeTerminate(); void Layout(); void MessageLoop(); - void SetFocus2() { SetFocus();} public: typedef ChromiumBrowser CLASSNAME; diff --git a/bazaar/ChromiumBrowser/ClientApp.h b/bazaar/ChromiumBrowser/ClientApp.h index ebb8abb02..100effb3d 100644 --- a/bazaar/ChromiumBrowser/ClientApp.h +++ b/bazaar/ChromiumBrowser/ClientApp.h @@ -24,7 +24,7 @@ class ClientApp: public CefApp, { private: - CefRefPtr GetRenderProcessHandler() { return this; } + CefRefPtr GetRenderProcessHandler() OVERRIDE { return this; } void V8ValueListToCefListValue(const CefV8ValueList& src, CefRefPtr & dst); public: @@ -32,11 +32,11 @@ public: ClientApp(); virtual void OnBeforeCommandLineProcessing(const CefString& process_type, - CefRefPtr command_line); + CefRefPtr command_line) OVERRIDE; virtual void OnContextCreated(CefRefPtr browser, CefRefPtr frame, - CefRefPtr context); + CefRefPtr context) OVERRIDE; virtual void OnFocusedNodeChanged(CefRefPtr browser, CefRefPtr frame,