Revert 158199 - extensions: Add ExtensionView interface.

chrome/browser/ui/views/extensions/extension_popup.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/views/extensions/extension_popup.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/views/extensions/extension_view_views.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
@@ skipping 43 matching lines @@
     views::BubbleBorder::ArrowLocation arrow_location,
     ShowAction show_action)
     : BubbleDelegateView(anchor_view, arrow_location),
       extension_host_(host),
       close_bubble_factory_(this) {
   inspect_with_devtools_ = show_action == SHOW_AND_INSPECT;
   // Adjust the margin so that contents fit better.
   const int margin = views::BubbleBorder::GetCornerRadius() / 2;
   set_margins(gfx::Insets(margin, margin, margin, margin));
   SetLayoutManager(new views::FillLayout());
-  AddChildView(static_cast<ExtensionViewViews*>(host->GetExtensionView()));
-  host->GetExtensionView()->SetContainer(this);
+  AddChildView(host->view());
+  host->view()->SetContainer(this);
   // Use OnNativeFocusChange to check for child window activation on deactivate.
   set_close_on_deactivate(false);
   // Make the bubble move with its anchor (during inspection, etc.).
   set_move_with_anchor(true);
 
   // Wait to show the popup until the contained host finishes loading.
   registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                  content::Source<WebContents>(host->host_contents()));
 
   // Listen for the containing view calling window.close();
@@ skipping 45 matching lines @@
         // Set inspect_with_devtools_ so the popup will be kept open while
         // the devtools are open.
         inspect_with_devtools_ = true;
       }
       break;
     default:
       NOTREACHED() << L"Received unexpected notification";
   }
 }
 
-void ExtensionPopup::OnExtensionSizeChanged(ExtensionView* view,
-                                            const gfx::Size& new_size) {
+void ExtensionPopup::OnExtensionSizeChanged(ExtensionViewViews* view) {
   SizeToContents();
 }
 
-void ExtensionPopup::OnExtensionViewDidShow(ExtensionView* view) {
-}
-
 gfx::Size ExtensionPopup::GetPreferredSize() {
   // Constrain the size to popup min/max.
   gfx::Size sz = views::View::GetPreferredSize();
   sz.set_width(std::max(kMinWidth, std::min(kMaxWidth, sz.width())));
   sz.set_height(std::max(kMinHeight, std::min(kMaxHeight, sz.height())));
   return sz;
 }
 
 void ExtensionPopup::OnNativeFocusChange(gfx::NativeView focused_before,
                                          gfx::NativeView focused_now) {
@@ skipping 57 matching lines @@
   if (inspect_with_devtools_) {
     DevToolsWindow::ToggleDevToolsWindow(host()->render_view_host(),
         true,
         DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);
   }
 }
 
 void ExtensionPopup::CloseBubble() {
   GetWidget()->Close();
 }