Revert 158199 - extensions: Add ExtensionView interface.

chrome/browser/ui/views/infobars/extension_infobar.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/infobars/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/platform_util.h"
-#include "chrome/browser/ui/views/extensions/extension_view_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "grit/theme_resources.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
@@ skipping 72 matching lines @@
     GetDelegate()->set_observer(NULL);
 }
 
 void ExtensionInfoBar::Layout() {
   InfoBarView::Layout();
 
   gfx::Size menu_size = menu_->GetPreferredSize();
   menu_->SetBounds(StartX(), OffsetY(menu_size), menu_size.width(),
                    menu_size.height());
 
-  ExtensionViewViews* view = static_cast<ExtensionViewViews*>(
-      GetDelegate()->extension_host()->GetExtensionView());
-  view->SetBounds(menu_->bounds().right() + kMenuHorizontalMargin,
-                  arrow_height(),
-                  std::max(0, EndX() - StartX() - ContentMinimumWidth()),
-                  height() - arrow_height() - 1);
+  GetDelegate()->extension_host()->view()->SetBounds(
+      menu_->bounds().right() + kMenuHorizontalMargin,
+      arrow_height(),
+      std::max(0, EndX() - StartX() - ContentMinimumWidth()),
+      height() - arrow_height() - 1);
 }
 
 void ExtensionInfoBar::ViewHierarchyChanged(bool is_add,
                                             views::View* parent,
                                             views::View* child) {
   if (!is_add || (child != this) || (menu_ != NULL)) {
     InfoBarView::ViewHierarchyChanged(is_add, parent, child);
     return;
   }
 
   menu_ = new views::MenuButton(NULL, string16(), this, false);
   menu_->SetVisible(false);
   menu_->set_focusable(true);
   AddChildView(menu_);
 
   extensions::ExtensionHost* extension_host = GetDelegate()->extension_host();
-  ExtensionViewViews* view =
-      static_cast<ExtensionViewViews*>(extension_host->GetExtensionView());
-  AddChildView(view);
+  AddChildView(extension_host->view());
 
   // This must happen after adding all other children so InfoBarView can ensure
   // the close button is the last child.
   InfoBarView::ViewHierarchyChanged(is_add, parent, child);
 
   // This must happen after adding all children because it can trigger layout,
   // which assumes that particular children (e.g. the close button) have already
   // been added.
   const extensions::Extension* extension = extension_host->extension();
   extension_misc::ExtensionIcons image_size =
@@ skipping 48 matching lines @@
 
   scoped_refptr<ExtensionContextMenuModel> options_menu_contents =
       new ExtensionContextMenuModel(extension, browser_);
   DCHECK_EQ(menu_, source);
   RunMenuAt(options_menu_contents.get(), menu_, views::MenuItemView::TOPLEFT);
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
   return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }