Re-Revert "[WebModals] New API for browser-scoped popup management."

chrome/browser/ui/browser_commands.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/ui/browser_commands.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 47 matching lines @@
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/content_restriction.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/translate/core/browser/language_state.h"
-#include "components/web_modal/popup_manager.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
@@ skipping 24 matching lines @@
 const char kOsOverrideForTabletSite[] = "Linux; Android 4.0.3";
 }
 
 using base::UserMetricsAction;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::Referrer;
 using content::SSLStatus;
 using content::WebContents;
+using web_modal::WebContentsModalDialogManager;
 
 namespace chrome {
 namespace {
 
 bool CanBookmarkCurrentPageInternal(const Browser* browser,
                                     bool check_remove_bookmark_ui) {
   BookmarkModel* model =
       BookmarkModelFactory::GetForProfile(browser->profile());
   return browser_defaults::bookmarks_enabled &&
       browser->profile()->GetPrefs()->GetBoolean(
@@ skipping 115 matching lines @@
   WebContents* new_tab = GetTabAndRevertIfNecessary(browser, disposition);
   new_tab->UserGestureDone();
   if (!new_tab->FocusLocationBarByDefault())
     new_tab->Focus();
   if (ignore_cache)
     new_tab->GetController().ReloadIgnoringCache(true);
   else
     new_tab->GetController().Reload(true);
 }
 
-bool IsShowingWebContentsModalDialog(Browser* browser) {
+bool IsShowingWebContentsModalDialog(const Browser* browser) {
   WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents)
     return false;
 
-  // In test code we may not have a popup manager.
-  if (!browser->popup_manager())
-    return false;
-
-  // TODO(gbillock): This is currently called in production by the CanPrint
-  // method, and may be too restrictive if we allow print preview to overlap.
-  // Re-assess how to queue print preview after we know more about popup
-  // management policy.
-  return browser->popup_manager()->IsWebModalDialogActive(web_contents);
+  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents);
+  return web_contents_modal_dialog_manager->IsDialogActive();
 }
 
 bool PrintPreviewShowing(const Browser* browser) {
 #if defined(ENABLE_FULL_PRINTING)
   WebContents* contents = browser->tab_strip_model()->GetActiveWebContents();
   printing::PrintPreviewDialogController* controller =
       printing::PrintPreviewDialogController::GetInstance();
   return controller && (controller->GetPrintPreviewForContents(contents) ||
                         controller->is_creating_print_preview_dialog());
 #else
@@ skipping 587 matching lines @@
   else
     print_view_manager->PrintPreviewNow(false);
 #else
   printing::PrintViewManagerBasic* print_view_manager =
       printing::PrintViewManagerBasic::FromWebContents(contents);
   print_view_manager->PrintNow();
 #endif  // defined(ENABLE_FULL_PRINTING)
 #endif  // defined(ENABLE_PRINTING)
 }
 
-bool CanPrint(Browser* browser) {
+bool CanPrint(const Browser* browser) {
   // Do not print when printing is disabled via pref or policy.
   // Do not print when a constrained window is showing. It's confusing.
-  // TODO(gbillock): Need to re-assess the call to
-  // IsShowingWebContentsModalDialog after a popup management policy is
-  // refined -- we will probably want to just queue the print request, not
-  // block it.
   return browser->profile()->GetPrefs()->GetBoolean(prefs::kPrintingEnabled) &&
       !(IsShowingWebContentsModalDialog(browser) ||
       GetContentRestrictions(browser) & CONTENT_RESTRICTION_PRINT);
 }
 
 void AdvancedPrint(Browser* browser) {
 #if defined(ENABLE_FULL_PRINTING)
   printing::PrintViewManager* print_view_manager =
       printing::PrintViewManager::FromWebContents(
           browser->tab_strip_model()->GetActiveWebContents());
   print_view_manager->AdvancedPrintNow();
 #endif
 }
 
-bool CanAdvancedPrint(Browser* browser) {
+bool CanAdvancedPrint(const Browser* browser) {
   // If printing is not disabled via pref or policy, it is always possible to
   // advanced print when the print preview is visible.  The exception to this
   // is under Win8 ash, since showing the advanced print dialog will open it
   // modally on the Desktop and hang the browser.  We can remove this check
   // once we integrate with the system print charm.
 #if defined(OS_WIN)
   if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
     return false;
 #endif
 
@@ skipping 382 matching lines @@
                                           browser->profile(),
                                           browser->host_desktop_type()));
   app_browser->tab_strip_model()->AppendWebContents(contents, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   app_browser->window()->Show();
 }
 
 }  // namespace chrome