Revert 158199 - extensions: Add ExtensionView interface.

chrome/browser/ui/gtk/infobars/extension_infobar_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/infobars/extension_infobar_gtk.h"
 
 #include "base/debug/trace_event.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
-#include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
@@ skipping 24 matching lines @@
   SetBarTargetHeight((height > 0) ? (height + kSeparatorLineHeight) : 0);
 
   BuildWidgets();
 }
 
 ExtensionInfoBarGtk::~ExtensionInfoBarGtk() {}
 
 void ExtensionInfoBarGtk::PlatformSpecificHide(bool animate) {
   // This view is not owned by us; we can't unparent it because we aren't the
   // owning container.
-  gtk_container_remove(GTK_CONTAINER(alignment_), view_->GetNativeView());
+  gtk_container_remove(GTK_CONTAINER(alignment_), view_->native_view());
 }
 
 void ExtensionInfoBarGtk::GetTopColor(InfoBarDelegate::Type type,
                                       double* r, double* g, double* b) {
   // Extension infobars are always drawn with chrome-theme colors.
   *r = *g = *b = 233.0 / 255.0;
 }
 
 void ExtensionInfoBarGtk::GetBottomColor(InfoBarDelegate::Type type,
                                          double* r, double* g, double* b) {
@@ skipping 55 matching lines @@
                      gfx::Size(extension_misc::EXTENSION_ICON_BITTY,
                                extension_misc::EXTENSION_ICON_BITTY),
                      ImageLoadingTracker::DONT_CACHE);
 
   // Pad the bottom of the infobar by one pixel for the border.
   alignment_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(alignment_), 0, 1, 0, 0);
   gtk_box_pack_start(GTK_BOX(hbox_), alignment_, TRUE, TRUE, 0);
 
   extensions::ExtensionHost* extension_host = delegate_->extension_host();
-  view_ = extension_host->GetExtensionView();
+  view_ = extension_host->view();
 
-  if (gtk_widget_get_parent(view_->GetNativeView())) {
-    gtk_widget_reparent(view_->GetNativeView(), alignment_);
+  if (gtk_widget_get_parent(view_->native_view())) {
+    gtk_widget_reparent(view_->native_view(), alignment_);
   } else {
-    gtk_container_add(GTK_CONTAINER(alignment_), view_->GetNativeView());
+    gtk_container_add(GTK_CONTAINER(alignment_), view_->native_view());
   }
 
   Signals()->Connect(button_, "button-press-event",
                      G_CALLBACK(&OnButtonPressThunk), this);
-  Signals()->Connect(view_->GetNativeView(), "expose-event",
+  Signals()->Connect(view_->native_view(), "expose-event",
                      G_CALLBACK(&OnExposeThunk), this);
-  Signals()->Connect(view_->GetNativeView(), "size_allocate",
+  Signals()->Connect(view_->native_view(), "size_allocate",
                      G_CALLBACK(&OnSizeAllocateThunk), this);
 }
 
 void ExtensionInfoBarGtk::StoppedShowing() {
   gtk_chrome_button_unset_paint_state(GTK_CHROME_BUTTON(button_));
 }
 
 Browser* ExtensionInfoBarGtk::GetBrowser() {
   // Get the Browser object this infobar is attached to.
   GtkWindow* parent = platform_util::GetTopLevel(icon_);
@@ skipping 12 matching lines @@
   if (!browser)
     return NULL;
 
   return new ExtensionContextMenuModel(extension, browser);
 }
 
 void ExtensionInfoBarGtk::OnSizeAllocate(GtkWidget* widget,
                                          GtkAllocation* allocation) {
   gfx::Size new_size(allocation->width, allocation->height);
 
-  delegate_->extension_host()->GetExtensionView()->GetRenderViewHost()->
-      GetView()->SetSize(new_size);
+  delegate_->extension_host()->view()->render_view_host()->GetView()
+      ->SetSize(new_size);
 }
 
 gboolean ExtensionInfoBarGtk::OnButtonPress(GtkWidget* widget,
                                             GdkEventButton* event) {
   if (event->button != 1)
     return FALSE;
 
   ui::MenuModel* model = BuildMenuModel();
   if (!model)
     return FALSE;
@@ skipping 12 matching lines @@
   // We also need to draw our infobar arrows over the renderer.
   static_cast<InfoBarContainerGtk*>(container())->
       PaintInfobarBitsOn(sender, event, this);
 
   return FALSE;
 }
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
   return new ExtensionInfoBarGtk(static_cast<InfoBarTabHelper*>(owner), this);
 }