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

chrome/browser/instant/instant_loader.cc

 // Copyright 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/instant/instant_loader.h"
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
-#include "chrome/browser/ui/constrained_window_tab_helper.h"
-#include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
+#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
+#include "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ipc/ipc_message.h"
 
 namespace {
 
 int kUserDataKey;
@@ skipping 10 matching lines @@
   InstantLoader* const loader_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantLoaderUserData);
 };
 
 }
 
 // WebContentsDelegateImpl -----------------------------------------------------
 
 class InstantLoader::WebContentsDelegateImpl
-    : public ConstrainedWindowTabHelperDelegate,
+    : public WebContentsModalDialogManagerDelegate,
       public CoreTabHelperDelegate,
       public content::WebContentsDelegate {
  public:
   explicit WebContentsDelegateImpl(InstantLoader* loader);
 
  private:
-  // Overridden from ConstrainedWindowTabHelperDelegate:
-  virtual bool ShouldFocusConstrainedWindow() OVERRIDE;
+  // Overridden from WebContentsModalDialogManagerDelegate:
+  virtual bool ShouldFocusWebContentsModalDialog() OVERRIDE;
 
   // Overridden from CoreTabHelperDelegate:
   virtual void SwapTabContents(content::WebContents* old_contents,
                                content::WebContents* new_contents) OVERRIDE;
 
   // Overridden from content::WebContentsDelegate:
   virtual bool ShouldSuppressDialogs() OVERRIDE;
   virtual bool ShouldFocusPageAfterCrash() OVERRIDE;
   virtual void LostCapture() OVERRIDE;
   virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;
@@ skipping 15 matching lines @@
   InstantLoader* const loader_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsDelegateImpl);
 };
 
 InstantLoader::WebContentsDelegateImpl::WebContentsDelegateImpl(
     InstantLoader* loader)
     : loader_(loader) {
 }
 
-bool InstantLoader::WebContentsDelegateImpl::ShouldFocusConstrainedWindow() {
-  // Return false so that constrained windows are not initially focused. If we
-  // did otherwise the preview would prematurely get committed when focus goes
-  // to the constrained window.
+bool InstantLoader::WebContentsDelegateImpl::ShouldFocusWebContentsModalDialog(
+) {
+  // Return false so that web contents modal dialogs are not initially
+  // focused. If we did otherwise the preview would prematurely get committed
+  // when focus goes to the dialog.
   return false;
 }
 
 void InstantLoader::WebContentsDelegateImpl::SwapTabContents(
     content::WebContents* old_contents,
     content::WebContents* new_contents) {
   // If this is being called, something is swapping in to loader's |contents_|
   // before we've added it to the tab strip.
   loader_->ReplacePreviewContents(old_contents, new_contents);
 }
@@ skipping 250 matching lines @@
   // contents is added to the tab strip.
 
   // Tab helpers to control popups.
   BlockedContentTabHelper::CreateForWebContents(contents());
   BlockedContentTabHelper::FromWebContents(contents())->
       SetAllContentsBlocked(true);
   TabSpecificContentSettings::CreateForWebContents(contents());
   TabSpecificContentSettings::FromWebContents(contents())->
       SetPopupsBlocked(true);
 
-  // A tab helper to control constrained windows.
-  ConstrainedWindowTabHelper::CreateForWebContents(contents());
-  ConstrainedWindowTabHelper::FromWebContents(contents())->
+  // A manager to control web contents modal dialogs.
+  WebContentsModalDialogManager::CreateForWebContents(contents());
+  WebContentsModalDialogManager::FromWebContents(contents())->
       set_delegate(delegate_.get());
 
   // A tab helper to catch prerender content swapping shenanigans.
   CoreTabHelper::CreateForWebContents(contents());
   CoreTabHelper::FromWebContents(contents())->set_delegate(delegate_.get());
 
   // Tab helpers used when committing a preview.
   chrome::search::SearchTabHelper::CreateForWebContents(contents());
   HistoryTabHelper::CreateForWebContents(contents());
 
@@ skipping 23 matching lines @@
   contents_->RemoveUserData(&kUserDataKey);
   contents_->SetDelegate(NULL);
 
   // Undo tab helper work done in SetupPreviewContents().
 
   BlockedContentTabHelper::FromWebContents(contents())->
       SetAllContentsBlocked(false);
   TabSpecificContentSettings::FromWebContents(contents())->
       SetPopupsBlocked(false);
 
-  ConstrainedWindowTabHelper::FromWebContents(contents())->
+  WebContentsModalDialogManager::FromWebContents(contents())->
       set_delegate(NULL);
 
   CoreTabHelper::FromWebContents(contents())->set_delegate(NULL);
 
 #if defined(OS_MACOSX)
   if (content::RenderWidgetHostView* rwhv =
           contents_->GetRenderWidgetHostView())
     rwhv->SetTakesFocusOnlyOnMouseDown(false);
   registrar_.Remove(this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
                     content::Source<content::NavigationController>(
                         &contents_->GetController()));
 #endif
 }
 
 void InstantLoader::ReplacePreviewContents(content::WebContents* old_contents,
                                            content::WebContents* new_contents) {
   DCHECK_EQ(old_contents, contents());
   CleanupPreviewContents();
   // We release here without deleting so that the caller still has the
   // responsibility for deleting the WebContents.
   ignore_result(contents_.release());
   contents_.reset(new_contents);
   SetupPreviewContents();
   controller_->SwappedWebContents();
 }