Fix views::WebView focus for Print Preview and other web dialogs.

chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
 
+#if defined(USE_AURA)
+#include "content/public/browser/render_widget_host_view.h"
+#include "ui/aura/client/focus_change_observer.h"
+#include "ui/aura/client/focus_client.h"
+#endif
+
 using ui::WebDialogDelegate;
 using ui::WebDialogWebContentsDelegate;
 
 namespace {
 
 class ConstrainedWebDialogDelegateViews
     : public ConstrainedWebDialogDelegateBase {
  public:
   ConstrainedWebDialogDelegateViews(content::BrowserContext* context,
                                     WebDialogDelegate* delegate,
@@ skipping 24 matching lines @@
 
  private:
   // Converts keyboard events on the WebContents to accelerators.
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   views::WebView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViews);
 };
 
+#if defined(USE_AURA)
+// TODO(msw): Make this part of WebView? Modify various WebContentsDelegates?
+class WebViewFocusHelper : public aura::client::FocusChangeObserver {
+ public:
+  explicit WebViewFocusHelper(views::WebView* web_view)
+      : web_view_(web_view),
+        native_view_(NULL),
+        focus_client_(NULL) {
+    if (web_view_ && web_view_->web_contents()) {
+      content::RenderWidgetHostView* host_view =
+          web_view_->web_contents()->GetRenderWidgetHostView();
+      native_view_ = host_view ? host_view->GetNativeView() : NULL;
+    }
+    if (native_view_)
+      focus_client_ = aura::client::GetFocusClient(native_view_);
+    if (focus_client_)
+      focus_client_->AddObserver(this);
+  }
+
+  virtual ~WebViewFocusHelper() {
+    if (focus_client_)
+      focus_client_->RemoveObserver(this);
+  }
+
+  virtual void OnWindowFocused(aura::Window* gained_focus,
+                               aura::Window* lost_focus) {
+    if (gained_focus == native_view_ && !web_view_->HasFocus())
+      web_view_->RequestFocus();
+  }
+
+ private:
+  views::WebView* web_view_;
+  gfx::NativeView native_view_;

[Ben Goodger (Google), 2014/07/31 18:20:15]

may as well just use aura::Window* here

[msw, 2014/07/31 18:35:14]

Done.

+  aura::client::FocusClient* focus_client_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewFocusHelper);
+};
+#endif
+
 class ConstrainedWebDialogDelegateViewViews
     : public views::WebView,
       public ConstrainedWebDialogDelegate,
       public views::WidgetDelegate {
  public:
   ConstrainedWebDialogDelegateViewViews(
       content::BrowserContext* browser_context,
       WebDialogDelegate* delegate,
       WebDialogWebContentsDelegate* tab_delegate)
       : views::WebView(browser_context),
@@ skipping 68 matching lines @@
     gfx::Size size;
     if (!impl_->closed_via_webui())
       GetWebDialogDelegate()->GetDialogSize(&size);
     return size;
   }
   virtual gfx::Size GetMinimumSize() const OVERRIDE {
     // Return an empty size so that we can be made smaller.
     return gfx::Size();
   }
 
+  void OnShow() {
+#if defined(USE_AURA)
+  web_view_focus_helper_.reset(new WebViewFocusHelper(this));
+#endif
+  }
+
  private:
   scoped_ptr<ConstrainedWebDialogDelegateViews> impl_;
+#if defined(USE_AURA)
+  scoped_ptr<WebViewFocusHelper> web_view_focus_helper_;
+#endif
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViewViews);
 };
 
 }  // namespace
 
 ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
     content::BrowserContext* browser_context,
     WebDialogDelegate* delegate,
     WebDialogWebContentsDelegate* tab_delegate,
     content::WebContents* web_contents) {
   ConstrainedWebDialogDelegateViewViews* dialog =
       new ConstrainedWebDialogDelegateViewViews(
           browser_context, delegate, tab_delegate);
   ShowWebModalDialogViews(dialog, web_contents);
+  dialog->OnShow();
   return dialog;
 }