Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1)

chrome/browser/ui/views/constrained_window_views.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/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
-#include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "net/base/net_util.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 348 matching lines @@
   client_view_bounds_ = CalculateClientAreaBounds(width(), height());
 }
 
 void ConstrainedWindowFrameView::OnThemeChanged() {
   InitWindowResources();
 }
 
 void ConstrainedWindowFrameView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   if (sender == close_button_)
-    container_->CloseConstrainedWindow();
+    container_->CloseWebContentsModalDialog();
 }
 
 int ConstrainedWindowFrameView::NonClientBorderThickness() const {
   return kFrameBorderThickness + kClientEdgeThickness;
 }
 
 int ConstrainedWindowFrameView::NonClientTopBorderHeight() const {
   return std::max(kFrameBorderThickness + IconSize(),
                   kFrameShadowThickness + kCaptionButtonHeightWithPadding) +
       TitlebarBottomThickness();
@@ skipping 145 matching lines @@
     container_ = container;
     ash::CustomFrameViewAsh::Init(container);
     // Always use "active" look.
     SetInactiveRenderingDisabled(true);
   }
 
   // views::ButtonListener overrides:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {
     if (sender == close_button())
-      container_->CloseConstrainedWindow();
+      container_->CloseWebContentsModalDialog();
   }
 
  private:
   ConstrainedWindowViews* container_;  // not owned
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowFrameViewAsh);
 };
 #endif  // defined(USE_ASH)
 
 ConstrainedWindowViews::ConstrainedWindowViews(
     content::WebContents* web_contents,
@@ skipping 14 matching lines @@
   views::corewm::SetChildWindowVisibilityChangesAnimated(params.parent);
   // No animations should get performed on the window since that will re-order
   // the window stack which will then cause many problems.
   if (params.parent && params.parent->parent()) {
     params.parent->parent()->SetProperty(aura::client::kAnimationsDisabledKey,
                                          true);
   }
 #endif
   Init(params);
 
-  ConstrainedWindowTabHelper* constrained_window_tab_helper =
-      ConstrainedWindowTabHelper::FromWebContents(web_contents_);
-  constrained_window_tab_helper->AddConstrainedDialog(this);
+  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents_);
+  web_contents_modal_dialog_manager->AddDialog(this);
 #if defined(USE_ASH)
   GetNativeWindow()->SetProperty(ash::kConstrainedWindowKey, true);
   views::corewm::SetModalParent(GetNativeWindow(),
                                 web_contents_->GetView()->GetNativeView());
 #endif
 }
 
 ConstrainedWindowViews::~ConstrainedWindowViews() {
 }
 
-void ConstrainedWindowViews::ShowConstrainedWindow() {
+void ConstrainedWindowViews::ShowWebContentsModalDialog() {
   Show();
-  FocusConstrainedWindow();
+  FocusWebContentsModalDialog();
 }
 
-void ConstrainedWindowViews::CloseConstrainedWindow() {
+void ConstrainedWindowViews::CloseWebContentsModalDialog() {
 #if defined(USE_ASH)
   gfx::NativeView view = web_contents_->GetNativeView();
   // Allow the parent to animate again.
   if (view && view->parent())
     view->parent()->ClearProperty(aura::client::kAnimationsDisabledKey);
 #endif
   NotifyTabHelperWillClose();
   Close();
 }
 
-void ConstrainedWindowViews::FocusConstrainedWindow() {
-  ConstrainedWindowTabHelper* helper =
-      ConstrainedWindowTabHelper::FromWebContents(web_contents_);
-  if ((!helper->delegate() ||
-       helper->delegate()->ShouldFocusConstrainedWindow()) &&
+void ConstrainedWindowViews::FocusWebContentsModalDialog() {
+  WebContentsModalDialogManager* manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents_);
+  if ((!manager->delegate() ||
+       manager->delegate()->ShouldFocusWebContentsModalDialog()) &&
       widget_delegate() &&
       widget_delegate()->GetInitiallyFocusedView()) {
     widget_delegate()->GetInitiallyFocusedView()->RequestFocus();
   }
 #if defined(USE_ASH)
   // We don't necessarily have a RootWindow yet.
   if (GetNativeView()->GetRootWindow())
     GetNativeView()->Focus();
 #endif
 }
 
 gfx::NativeWindow ConstrainedWindowViews::GetNativeWindow() {
   return Widget::GetNativeWindow();
 }
 
 void ConstrainedWindowViews::NotifyTabHelperWillClose() {
   if (!web_contents_)
     return;
 
-  ConstrainedWindowTabHelper* constrained_window_tab_helper =
-      ConstrainedWindowTabHelper::FromWebContents(web_contents_);
-  constrained_window_tab_helper->WillClose(this);
+  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents_);
+  web_contents_modal_dialog_manager->WillClose(this);
 }
 
 views::NonClientFrameView* ConstrainedWindowViews::CreateNonClientFrameView() {
 #if defined(USE_ASH)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableNewDialogStyle))
     return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(this);
   ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh;
   frame->Init(this);
   return frame;
@@ skipping 11 matching lines @@
 
 views::internal::NativeWidgetDelegate*
     ConstrainedWindowViews::AsNativeWidgetDelegate() {
   return this;
 }
 
 int ConstrainedWindowViews::GetNonClientComponent(const gfx::Point& point) {
   // Prevent a constrained window to be moved by the user.
   return HTNOWHERE;
 }