Revert 158199 - extensions: Add ExtensionView interface.

chrome/browser/ui/gtk/extensions/extension_popup_gtk.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/gtk/extensions/extension_popup_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
-#include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.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/render_widget_host_view.h"
 #include "googleurl/src/gurl.h"
@@ skipping 12 matching lines @@
 
 ExtensionPopupGtk::ExtensionPopupGtk(Browser* browser,
                                      extensions::ExtensionHost* host,
                                      GtkWidget* anchor,
                                      ShowAction show_action)
     : browser_(browser),
       bubble_(NULL),
       host_(host),
       anchor_(anchor),
       weak_factory_(this) {
-  host_->GetExtensionView()->SetContainer(this);
+  host_->view()->SetContainer(this);
   being_inspected_ = show_action == SHOW_AND_INSPECT;
 
   // If the host had somehow finished loading, then we'd miss the notification
   // and not show.  This seems to happen in single-process mode.
   if (host->did_stop_loading()) {
     ShowPopup();
   } else {
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                    content::Source<Profile>(host->profile()));
   }
@@ skipping 69 matching lines @@
       NOTREACHED() << "Received unexpected notification";
   }
 }
 
 void ExtensionPopupGtk::BubbleClosing(BubbleGtk* bubble,
                                       bool closed_by_escape) {
   current_extension_popup_ = NULL;
   delete this;
 }
 
-void ExtensionPopupGtk::OnExtensionSizeChanged(ExtensionView* view,
-                                               const gfx::Size& new_size) {
+void ExtensionPopupGtk::OnExtensionSizeChanged(
+    ExtensionViewGtk* view,
+    const gfx::Size& new_size) {
   int width = std::max(kMinWidth, std::min(kMaxWidth, new_size.width()));
   int height = std::max(kMinHeight, std::min(kMaxHeight, new_size.height()));
 
-  view->GetRenderViewHost()->GetView()->SetSize(gfx::Size(width, height));
-  gtk_widget_set_size_request(view->GetNativeView(), width, height);
-}
-
-void ExtensionPopupGtk::OnExtensionViewDidShow(ExtensionView* view) {
+  view->render_view_host()->GetView()->SetSize(gfx::Size(width, height));
+  gtk_widget_set_size_request(view->native_view(), width, height);
 }
 
 bool ExtensionPopupGtk::DestroyPopup() {
   if (!bubble_) {
     NOTREACHED();
     return false;
   }
 
   bubble_->Close();
   return true;
@@ skipping 13 matching lines @@
   // non-NULL if a browser action button is clicked while another extension
   // popup's extension host is still loading.
   if (current_extension_popup_)
     current_extension_popup_->DestroyPopup();
   current_extension_popup_ = this;
 
   GtkWidget* border_box = gtk_alignment_new(0, 0, 1.0, 1.0);
   // This border is necessary so the bubble's corners do not get cut off by the
   // render view.
   gtk_container_set_border_width(GTK_CONTAINER(border_box), 2);
-  gtk_container_add(GTK_CONTAINER(border_box),
-                    host_->GetExtensionView()->GetNativeView());
+  gtk_container_add(GTK_CONTAINER(border_box), host_->view()->native_view());
 
   // We'll be in the upper-right corner of the window for LTR languages, so we
   // want to put the arrow at the upper-right corner of the bubble to match the
   // page and app menus.
   BubbleGtk::ArrowLocationGtk arrow_location =
       !base::i18n::IsRTL() ?
       BubbleGtk::ARROW_LOCATION_TOP_RIGHT :
       BubbleGtk::ARROW_LOCATION_TOP_LEFT;
   bubble_ = BubbleGtk::Show(anchor_,
                             NULL,
                             border_box,
                             arrow_location,
                             being_inspected_ ? 0 :
                                 BubbleGtk::POPUP_WINDOW | BubbleGtk::GRAB_INPUT,
                             GtkThemeService::GetFrom(browser_->profile()),
                             this);
 }
 
 void ExtensionPopupGtk::DestroyPopupWithoutResult() {
   DestroyPopup();
 }
 
 gfx::Rect ExtensionPopupGtk::GetViewBounds() {
   GtkAllocation allocation;
-  gtk_widget_get_allocation(host_->GetExtensionView()->GetNativeView(),
-                            &allocation);
+  gtk_widget_get_allocation(host_->view()->native_view(), &allocation);
   return gfx::Rect(allocation);
 }