[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 46 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/web_contents_modal_dialog_manager.h"
+#include "components/web_modal/popup_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 121 matching lines @@
   else
     new_tab->GetController().Reload(true);
 }
 
 bool IsShowingWebContentsModalDialog(const Browser* browser) {
   WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents)
     return false;
 
-  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      WebContentsModalDialogManager::FromWebContents(web_contents);
-  return web_contents_modal_dialog_manager->IsDialogActive();
+  // TODO(gbillock): This gets called by the CanPrint method, and may be too
+  // restrictive if we allow print preview to overlap -- we should just queue
+  // print requests or attach a user gesture or whatever we know.

[Peter Kasting, 2014/07/08 19:13:54]

Nit: I don't know what "whatever we know" means here.  Also, if this check is
only for tests, does this TODO really matter?  Or are you saying this can affect
non-test code?

[Greg Billock, 2014/07/09 19:28:12]

Me either. This is dependent on popup policy which is TBD.
The TODO is for the whole notion that this code stanza should exist in anything
resembling its current form, which it likely should not. On the bright side,
it's perfectly fine in the current state of things -- it's only bad in a
centrally-managed-popups world.

[Peter Kasting, 2014/07/09 19:41:41]

I might just rewrite the comment to be simpler then, like "TODO: When we move to
centrally-managed popups, this code likely doesn't make sense [optionally:
"because x"].  Instead think about <blah>."

[Greg Billock, 2014/07/10 18:32:03]

Done.

+  // Note: check because tests may not have a popup manager.

[Peter Kasting, 2014/07/08 19:13:54]

Nit: Move this sentence above the TODO and rewrite: "In test code we may not
have a popup manager."

[Greg Billock, 2014/07/09 19:28:12]

Done.

+  if (!browser->popup_manager())
+    return false;
+
+  return browser->popup_manager()->IsWebModalDialogActive(web_contents);
 }
 
 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 999 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