Abstract base 'ExtensionView' to Fix DEPS violation in extension_view_host.h

chrome/browser/extensions/extension_view_host.cc

 // Copyright 2013 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/extensions/extension_view_host.h"
 
 #include "base/strings/string_piece.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_system.h"
@@ skipping 50 matching lines @@
 ExtensionViewHost::~ExtensionViewHost() {
   // The hosting WebContents will be deleted in the base class, so unregister
   // this object before it deletes the attached WebContentsModalDialogManager.
   WebContentsModalDialogManager* manager =
       WebContentsModalDialogManager::FromWebContents(host_contents());
   if (manager)
     manager->SetDelegate(NULL);
 }
 
 void ExtensionViewHost::CreateView(Browser* browser) {
-#if defined(TOOLKIT_VIEWS)
-  view_.reset(new ExtensionViewViews(this, browser));
-  // We own |view_|, so don't auto delete when it's removed from the view
-  // hierarchy.
-  view_->set_owned_by_client();
-#elif defined(OS_MACOSX)
-  view_.reset(new ExtensionViewMac(this, browser));
+  view_ = CreateExtensionView(this, browser);
   view_->Init();
-#else
-  // TODO(port)
-  NOTREACHED();
-#endif
 }
 
 void ExtensionViewHost::SetAssociatedWebContents(WebContents* web_contents) {
   associated_web_contents_ = web_contents;
   if (associated_web_contents_) {
     // Observe the new WebContents for deletion.
     associated_web_contents_observer_.reset(
         new AssociatedWebContentsObserver(this, associated_web_contents_));
   } else {
     associated_web_contents_observer_.reset();
   }
 }
 
 void ExtensionViewHost::UnhandledKeyboardEvent(
     WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
-  Browser* browser = view_->browser();
-  if (browser) {
-    // Handle lower priority browser shortcuts such as Ctrl-f.
-    return browser->HandleKeyboardEvent(source, event);
-  } else {
-#if defined(TOOLKIT_VIEWS)
-    // In case there's no Browser (e.g. for dialogs), pass it to
-    // ExtensionViewViews to handle accelerators. The view's FocusManager does
-    // not know anything about Browser accelerators, but might know others such
-    // as Ash's.
-    view_->HandleKeyboardEvent(event);
-#endif
-  }
+  view_->HandleKeyboardEvent(source, event);
 }

[tapted, 2014/07/03 12:45:28]

note that ExtensionView*Host*Mac didn't use this implementation of
UnhandledKeyboardEvent due to an override (which is now moved into from the Host
into ExtensionViewMac::HandleKeyboardEvent() via the generic base). I think this
is the only subtle change - the rest is fairly mechanical.

 
 // ExtensionHost overrides:
 
 void ExtensionViewHost::OnDidStopLoading() {
   DCHECK(did_stop_loading());
-#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
   view_->DidStopLoading();
-#endif
 }
 
 void ExtensionViewHost::OnDocumentAvailable() {
   if (extension_host_type() == VIEW_TYPE_EXTENSION_INFOBAR) {
     // No style sheet for other types, at the moment.
     InsertInfobarCSS();
   }
 }
 
 void ExtensionViewHost::LoadInitialURL() {
@@ skipping 30 matching lines @@
   switch (params.disposition) {
     case SINGLETON_TAB:
     case NEW_FOREGROUND_TAB:
     case NEW_BACKGROUND_TAB:
     case NEW_POPUP:
     case NEW_WINDOW:
     case SAVE_TO_DISK:
     case OFF_THE_RECORD: {
       // Only allow these from hosts that are bound to a browser (e.g. popups).
       // Otherwise they are not driven by a user gesture.
-      Browser* browser = view_->browser();
+      Browser* browser = view_->GetBrowser();
       return browser ? browser->OpenURL(params) : NULL;
     }
     default:
       return NULL;
   }
 }
 
 bool ExtensionViewHost::PreHandleKeyboardEvent(
     WebContents* source,
     const NativeWebKeyboardEvent& event,
     bool* is_keyboard_shortcut) {
   if (extension_host_type() == VIEW_TYPE_EXTENSION_POPUP &&
       event.type == NativeWebKeyboardEvent::RawKeyDown &&
       event.windowsKeyCode == ui::VKEY_ESCAPE) {
     DCHECK(is_keyboard_shortcut != NULL);
     *is_keyboard_shortcut = true;
     return false;
   }
 
   // Handle higher priority browser shortcuts such as Ctrl-w.
-  Browser* browser = view_->browser();
+  Browser* browser = view_->GetBrowser();
   if (browser)
     return browser->PreHandleKeyboardEvent(source, event, is_keyboard_shortcut);
 
   *is_keyboard_shortcut = false;
   return false;
 }
 
 void ExtensionViewHost::HandleKeyboardEvent(
     WebContents* source,
     const NativeWebKeyboardEvent& event) {
@@ skipping 61 matching lines @@
 web_modal::WebContentsModalDialogHost*
 ExtensionViewHost::GetWebContentsModalDialogHost() {
   return this;
 }
 
 bool ExtensionViewHost::IsWebContentsVisible(WebContents* web_contents) {
   return platform_util::IsVisible(web_contents->GetNativeView());
 }
 
 gfx::NativeView ExtensionViewHost::GetHostView() const {
-  return view_->native_view();
+  return view_->GetNativeView();
 }
 
 gfx::Point ExtensionViewHost::GetDialogPosition(const gfx::Size& size) {
   if (!GetVisibleWebContents())
     return gfx::Point();
   gfx::Rect bounds = GetVisibleWebContents()->GetViewBounds();
   return gfx::Point(
       std::max(0, (bounds.width() - size.width()) / 2),
       std::max(0, (bounds.height() - size.height()) / 2));
 }
 
 gfx::Size ExtensionViewHost::GetMaximumDialogSize() {
   if (!GetVisibleWebContents())
     return gfx::Size();
   return GetVisibleWebContents()->GetViewBounds().size();
 }
 
 void ExtensionViewHost::AddObserver(
     web_modal::ModalDialogHostObserver* observer) {
 }
 
 void ExtensionViewHost::RemoveObserver(
     web_modal::ModalDialogHostObserver* observer) {
 }
 
 WindowController* ExtensionViewHost::GetExtensionWindowController() const {
-  return view_->browser() ? view_->browser()->extension_window_controller()
-                          : NULL;
+  Browser* browser = view_->GetBrowser();
+  return browser ? browser->extension_window_controller() : NULL;
 }
 
 WebContents* ExtensionViewHost::GetAssociatedWebContents() const {
   return associated_web_contents_;
 }
 
 WebContents* ExtensionViewHost::GetVisibleWebContents() const {
   if (associated_web_contents_)
     return associated_web_contents_;
   if (extension_host_type() == VIEW_TYPE_EXTENSION_POPUP)
@@ skipping 15 matching lines @@
 
 void ExtensionViewHost::InsertInfobarCSS() {
   static const base::StringPiece css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_EXTENSIONS_INFOBAR_CSS));
 
   host_contents()->InsertCSS(css.as_string());
 }
 
 }  // namespace extensions