Convert more users away from DOMView.

chrome/browser/ui/views/html_dialog_view.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/html_dialog_view.h"
 
 #include <vector>
 
+#include "base/property_bag.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/webui/html_dialog_controller.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/views/controls/webview/webview.h"
 #include "ui/views/events/event.h"
+#include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/event.h"
 #include "ui/views/widget/native_widget_aura.h"
 #endif
 
 using content::WebContents;
 using content::WebUIMessageHandler;
 
 namespace browser {
 
 // Declared in browser_dialogs.h so that others don't need to depend on our .h.
 gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent,
                                  Profile* profile,
                                  Browser* browser,
                                  HtmlDialogUIDelegate* delegate,
                                  DialogStyle style) {
-  HtmlDialogView* html_view = new HtmlDialogView(profile, browser, delegate);
-  views::Widget::CreateWindowWithParent(html_view, parent);
-  html_view->InitDialog();
-  html_view->GetWidget()->Show();
-  return html_view->GetWidget()->GetNativeWindow();
+  views::Widget* widget = views::Widget::CreateWindowWithParent(
+      new HtmlDialogView(profile, browser, delegate),
+      parent);
+  widget->Show();
+  return widget->GetNativeWindow();
 }
 
 void CloseHtmlDialog(gfx::NativeWindow window) {
   views::Widget::GetWidgetForNativeWindow(window)->Close();
 }
 
 }  // namespace browser
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, public:
 
 HtmlDialogView::HtmlDialogView(Profile* profile,
                                Browser* browser,
                                HtmlDialogUIDelegate* delegate)
-    : DOMView(),
-      HtmlDialogTabContentsDelegate(profile),
+    : HtmlDialogTabContentsDelegate(profile),
       initialized_(false),
       delegate_(delegate),
-      dialog_controller_(new HtmlDialogController(this, profile, browser)) {
+      dialog_controller_(new HtmlDialogController(this, profile, browser)),
+      web_view_(new views::WebView(profile)) {
+  AddChildView(web_view_);
+  SetLayoutManager(new views::FillLayout);
+  // Pressing the ESC key will close the dialog.
+  AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, false, false, false));
 }
 
 HtmlDialogView::~HtmlDialogView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, views::View implementation:
 
 gfx::Size HtmlDialogView::GetPreferredSize() {
   gfx::Size out;
   if (delegate_)
     delegate_->GetMinimumDialogSize(&out);
   return out;
 }
 
 bool HtmlDialogView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   // Pressing ESC closes the dialog.
   DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
   OnDialogClosed(std::string());
   return true;
 }
 
-void HtmlDialogView::ViewHierarchyChanged(
-    bool is_add, View* parent, View* child) {
-  DOMView::ViewHierarchyChanged(is_add, parent, child);
-  if (is_add && GetWidget() && !initialized_) {
-    initialized_ = true;
-    RegisterDialogAccelerators();
-  }
+void HtmlDialogView::ViewHierarchyChanged(bool is_add,
+                                          views::View* parent,
+                                          views::View* child) {
+  if (is_add && GetWidget())
+    InitDialog();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, views::WidgetDelegate implementation:
 
 bool HtmlDialogView::CanResize() const {
   return true;
 }
 
 ui::ModalType HtmlDialogView::GetModalType() const {
@@ skipping 18 matching lines @@
   // dialog.
   if (delegate_)
     OnDialogClosed("");
 }
 
 views::View* HtmlDialogView::GetContentsView() {
   return this;
 }
 
 views::View* HtmlDialogView::GetInitiallyFocusedView() {
-  return this;
+  return web_view_;
 }
 
 bool HtmlDialogView::ShouldShowWindowTitle() const {
   return ShouldShowDialogTitle();
 }
 
 views::Widget* HtmlDialogView::GetWidget() {
   return View::GetWidget();
 }
 
@@ skipping 133 matching lines @@
   HtmlDialogTabContentsDelegate::AddNewContents(
       source, new_contents, disposition, initial_pos, user_gesture);
 }
 
 void HtmlDialogView::LoadingStateChanged(content::WebContents* source) {
   if (delegate_)
     delegate_->OnLoadingStateChanged(source);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// HtmlDialogView:
+// HtmlDialogView, protected:
+
+
+void HtmlDialogView::OnRenderHostCreated(content::RenderViewHost* host) {
+}
+
+void HtmlDialogView::OnTabMainFrameLoaded() {
+}
+
+void HtmlDialogView::OnTabMainFrameRender() {
+  tab_watcher_.reset();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// HtmlDialogView, private:
 
 void HtmlDialogView::InitDialog() {
-  // Now Init the DOMView. This view runs in its own process to render the html.
-  DOMView::Init(profile(), NULL);
+  static bool initialized = false;

[sky, 2012/04/20 22:59:37]

How come initialized is static?

[Ben Goodger (Google), 2012/04/21 04:49:28]

so I can only init once.

[sky, 2012/04/21 16:13:31]

Doesn't this need to set up a bunch of state that is needed for each instance?

+  if (initialized)
+    return;
+  initialized = true;
 
-  WebContents* web_contents = dom_contents_->web_contents();
+  content::WebContents* web_contents = web_view_->GetWebContents();
   web_contents->SetDelegate(this);
 
   // Set the delegate. This must be done before loading the page. See
   // the comment above HtmlDialogUI in its header file for why.
   HtmlDialogUI::GetPropertyAccessor().SetProperty(
       web_contents->GetPropertyBag(), this);
   tab_watcher_.reset(new TabRenderWatcher(web_contents, this));
 
   if (delegate_) {
     gfx::Size out;
     delegate_->GetDialogSize(&out);
     if (!out.IsEmpty() && GetWidget())
       GetWidget()->CenterWindow(out);
   }
 
-  DOMView::LoadURL(GetDialogContentURL());
+  web_view_->LoadInitialURL(GetDialogContentURL());
 }
-
-void HtmlDialogView::RegisterDialogAccelerators() {
-  // Pressing the ESC key will close the dialog.
-  AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, false, false, false));
-}
-
-void HtmlDialogView::OnRenderHostCreated(content::RenderViewHost* host) {
-}
-
-void HtmlDialogView::OnTabMainFrameLoaded() {
-}
-
-void HtmlDialogView::OnTabMainFrameRender() {
-  tab_watcher_.reset();
-}