Removes unnecessary calls to FocusManager

ui/views/controls/webview/webview.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 "ui/views/controls/webview/webview.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "content/public/browser/browser_accessibility_state.h"
@@ skipping 253 matching lines @@
 void WebView::RenderViewReady() {
   NotifyAccessibilityWebContentsChanged();
 }
 
 void WebView::RenderViewDeleted(content::RenderViewHost* render_view_host) {
   NotifyAccessibilityWebContentsChanged();
 }
 
 void WebView::RenderViewHostChanged(content::RenderViewHost* old_host,
                                     content::RenderViewHost* new_host) {
-  FocusManager* const focus_manager = GetFocusManager();
-  if (focus_manager && focus_manager->GetFocusedView() == this)
+  if (HasFocus())
     OnFocus();
   NotifyAccessibilityWebContentsChanged();
 }
 
 void WebView::WebContentsDestroyed() {
   if (observing_render_process_host_) {
     observing_render_process_host_->RemoveObserver(this);
     observing_render_process_host_ = nullptr;
   }
   NotifyAccessibilityWebContentsChanged();
@@ skipping 17 matching lines @@
 
 void WebView::DidAttachInterstitialPage() {
   NotifyAccessibilityWebContentsChanged();
 }
 
 void WebView::DidDetachInterstitialPage() {
   NotifyAccessibilityWebContentsChanged();
 }
 
 void WebView::OnWebContentsFocused() {
-  FocusManager* focus_manager = GetFocusManager();
-  if (focus_manager)
-    focus_manager->SetFocusedView(this);
+  RequestFocus();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebView, private:
 
 void WebView::AttachWebContents() {
   // Prevents attachment if the WebView isn't already in a Widget, or it's
   // already attached.
   if (!GetWidget() || !web_contents())
     return;
 
   const gfx::NativeView view_to_attach = is_embedding_fullscreen_widget_ ?
       web_contents()->GetFullscreenRenderWidgetHostView()->GetNativeView() :
       web_contents()->GetNativeView();
   OnBoundsChanged(bounds());
   if (holder_->native_view() == view_to_attach)
     return;
 
   holder_->Attach(view_to_attach);
 
-  // The view will not be focused automatically when it is attached, so we need
-  // to pass on focus to it if the FocusManager thinks the view is focused. Note
-  // that not every Widget has a focus manager.
-  FocusManager* const focus_manager = GetFocusManager();
-  if (focus_manager && focus_manager->GetFocusedView() == this)
+  // The WebContents will not be focused automatically when it is attached, so
+  // we need to pass on focus to if focused.

[msw, 2017/03/10 17:47:08]

nit: clarify 'pass on focus to if focused'?

[sky, 2017/03/10 18:06:11]

Done.

+  if (HasFocus())
     OnFocus();
 
   OnWebContentsAttached();
 }
 
 void WebView::DetachWebContents() {
   if (web_contents())
     holder_->Detach();
 }
 
@@ skipping 32 matching lines @@
   if (!contents) {
     content::WebContents::CreateParams create_params(
         browser_context, NULL);
     return content::WebContents::Create(create_params);
   }
 
   return contents;
 }
 
 }  // namespace views