[WIN] Fix urlbar focus issue

rogerwang · rogerwang · commit d699ce8cafc0 · 2013-10-08T09:49:53.000+08:00
urlbar was changed to View based in upstream; the webview needs
to be properly focused to move focus away from urlbar, or urlbar
won't take focus again since it thinks it is focused already
diff --git a/src/browser/native_window_win.h b/src/browser/native_window_win.h
@@ -125,6 +125,7 @@ class NativeWindowWin : public NativeWindow,
                                    ui::WindowShowState show_state) OVERRIDE;
 
  private:
+  friend class content::Shell;
   void OnViewWasResized();
 
   NativeWindowToolbarWin* toolbar_;
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -60,6 +60,13 @@
 #include "net/base/escape.h"
 #include "ui/base/resource/resource_bundle.h"
 
+
+#if defined(OS_WIN)
+#include "content/nw/src/browser/native_window_win.h"
+#include "ui/views/controls/webview/webview.h"
+using nw::NativeWindowWin;
+#endif
+
 #include "content/nw/src/browser/printing/print_view_manager.h"
 
 using base::MessageLoop;
@@ -476,6 +483,13 @@ void Shell::WebContentsCreated(WebContents* source_contents,
   Shell::Create(source_contents, GURL::EmptyGURL(), manifest.get(), new_contents);
 }
 
+#if defined(OS_WIN)
+void Shell::WebContentsFocused(content::WebContents* web_contents) {
+  NativeWindowWin* win = static_cast<NativeWindowWin*>(window_.get());
+  win->web_view_->OnWebContentsFocused(web_contents);
+}
+#endif
+
 content::ColorChooser*
 Shell::OpenColorChooser(content::WebContents* web_contents, SkColor color) {
   return nw::ShowColorChooser(web_contents, color);
diff --git a/src/nw_shell.h b/src/nw_shell.h
@@ -148,6 +148,9 @@ class Shell : public WebContentsDelegate,
                                   const string16& frame_name,
                                   const GURL& target_url,
                                   WebContents* new_contents) OVERRIDE;
+#if defined(OS_WIN)
+  virtual void WebContentsFocused(WebContents* contents) OVERRIDE;
+#endif
   virtual content::ColorChooser* OpenColorChooser(
       content::WebContents* web_contents, SkColor color) OVERRIDE;
   virtual void RunFileChooser(
