Revert 158199 - extensions: Add ExtensionView interface.

chrome/browser/ui/views/extensions/extension_dialog.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_dialog.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/base_window.h"
 #include "chrome/browser/ui/views/extensions/extension_dialog_observer.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/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/background.h"
 #include "ui/views/widget/widget.h"
@@ skipping 13 matching lines @@
   AddRef();  // Balanced in DeleteDelegate();
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                  content::Source<Profile>(host->profile()));
   // Listen for the containing view calling window.close();
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  content::Source<Profile>(host->profile()));
   // Listen for a crash or other termination of the extension process.
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED,
                  content::Source<Profile>(host->profile()));
-
-  view_ = static_cast<ExtensionViewViews*>(host->GetExtensionView());
 }
 
 ExtensionDialog::~ExtensionDialog() {
 }
 
 // static
 ExtensionDialog* ExtensionDialog::Show(
     const GURL& url,
     BaseWindow* base_window,
     Profile* profile,
@@ skipping 39 matching lines @@
     ExtensionDialogObserver* observer) {
   CHECK(fullscreen || base_window);
   ExtensionDialog* dialog = new ExtensionDialog(host, observer);
   dialog->set_title(title);
 
   if (fullscreen)
     dialog->InitWindowFullscreen();
   else
     dialog->InitWindow(base_window, width, height);
 
+  // Show a white background while the extension loads.  This is prettier than
+  // flashing a black unfilled window frame.
+  host->view()->set_background(
+      views::Background::CreateSolidBackground(0xFF, 0xFF, 0xFF));
+  host->view()->SetVisible(true);
+
   // Ensure the DOM JavaScript can respond immediately to keyboard shortcuts.
   host->host_contents()->Focus();
   return dialog;
 }
 
 // static
 extensions::ExtensionHost* ExtensionDialog::CreateExtensionHost(
     const GURL& url,
     Profile* profile) {
   DCHECK(profile);
@@ skipping 17 matching lines @@
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = this;
   params.parent = root_window;
   window_->Init(params);
   window_->StackAtTop();
   window_->SetBounds(screen_rect);
   window_->Show();
 
   // TODO(jamescook): Remove redundant call to Activate()?
   window_->Activate();
-
-  // Show a white background while the extension loads.  This is prettier than
-  // flashing a black unfilled window frame.
-  view_->set_background(
-      views::Background::CreateSolidBackground(0xFF, 0xFF, 0xFF));
-  view_->SetVisible(true);
 }
 #else
 void ExtensionDialog::InitWindowFullscreen() {
   NOTIMPLEMENTED();
 }
 #endif
 
 
 void ExtensionDialog::InitWindow(BaseWindow* base_window,
                                  int width,
                                  int height) {
   gfx::NativeWindow parent = base_window->GetNativeWindow();
   window_ = views::Widget::CreateWindowWithParent(this, parent);
 
   // Center the window over the browser.
   gfx::Point center = base_window->GetBounds().CenterPoint();
   int x = center.x() - width / 2;
   int y = center.y() - height / 2;
   // Ensure the top left and top right of the window are on screen, with
   // priority given to the top left.
   gfx::Rect screen_rect = gfx::Screen::GetDisplayNearestPoint(center).bounds();
   gfx::Rect bounds_rect = gfx::Rect(x, y, width, height);
   bounds_rect = bounds_rect.AdjustToFit(screen_rect);
   window_->SetBounds(bounds_rect);
 
   window_->Show();
   // TODO(jamescook): Remove redundant call to Activate()?
   window_->Activate();
-
-  // Show a white background while the extension loads.  This is prettier than
-  // flashing a black unfilled window frame.
-  view_->set_background(
-      views::Background::CreateSolidBackground(0xFF, 0xFF, 0xFF));
-  view_->SetVisible(true);
 }
 
 void ExtensionDialog::ObserverDestroyed() {
   observer_ = NULL;
 }
 
 void ExtensionDialog::Close() {
   if (!window_)
     return;
 
@@ skipping 19 matching lines @@
   // See bug.com/127222.
   focus_manager->SetFocusedView(GetContentsView());
   view->Focus();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // views::WidgetDelegate overrides.
 
 bool ExtensionDialog::CanResize() const {
   // Can resize only if minimum contents size set.
-  return view_->GetPreferredSize() != gfx::Size();
+  return extension_host_->view()->GetPreferredSize() != gfx::Size();
 }
 
 void ExtensionDialog::SetMinimumContentsSize(int width, int height) {
-  view_->SetPreferredSize(gfx::Size(width, height));
+  extension_host_->view()->SetPreferredSize(gfx::Size(width, height));
 }
 
 ui::ModalType ExtensionDialog::GetModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 bool ExtensionDialog::ShouldShowWindowTitle() const {
   return !window_title_.empty();
 }
 
 string16 ExtensionDialog::GetWindowTitle() const {
   return window_title_;
 }
 
 void ExtensionDialog::WindowClosing() {
   if (observer_)
     observer_->ExtensionDialogClosing(this);
 }
 
 void ExtensionDialog::DeleteDelegate() {
   // The window has finished closing.  Allow ourself to be deleted.
   Release();
 }
 
 views::Widget* ExtensionDialog::GetWidget() {
-  return view_->GetWidget();
+  return extension_host_->view()->GetWidget();
 }
 
 const views::Widget* ExtensionDialog::GetWidget() const {
-  return view_->GetWidget();
+  return extension_host_->view()->GetWidget();
 }
 
 views::View* ExtensionDialog::GetContentsView() {
-  return view_;
+  return extension_host_->view();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // content::NotificationObserver overrides.
 
 void ExtensionDialog::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING:
       // Avoid potential overdraw by removing the temporary background after
       // the extension finishes loading.
-      view_->set_background(NULL);
+      extension_host_->view()->set_background(NULL);
       // The render view is created during the LoadURL(), so we should
       // set the focus to the view if nobody else takes the focus.
       if (content::Details<extensions::ExtensionHost>(host()) == details)
         MaybeFocusRenderView();
       break;
     case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE:
       // If we aren't the host of the popup, then disregard the notification.
       if (content::Details<extensions::ExtensionHost>(host()) != details)
         return;
       Close();
       break;
     case chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED:
       if (content::Details<extensions::ExtensionHost>(host()) != details)
         return;
       if (observer_)
         observer_->ExtensionTerminated(this);
       break;
     default:
       NOTREACHED() << L"Received unexpected notification";
       break;
   }
 }