summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwittman@chromium.org <wittman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-28 02:49:01 +0000
committerwittman@chromium.org <wittman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-28 02:49:01 +0000
commita1306f26b31833d6ef5aaee472d9889d145e3032 (patch)
tree8afbc32e01fdad865703ed8d70a68e5a54795afc
parentfd8d8d6cab072673afc99779df2b214a3e3f3f7d (diff)
downloadchromium_src-a1306f26b31833d6ef5aaee472d9889d145e3032.zip
chromium_src-a1306f26b31833d6ef5aaee472d9889d145e3032.tar.gz
chromium_src-a1306f26b31833d6ef5aaee472d9889d145e3032.tar.bz2
Rename WebContentsModalDialogManager::AddDialog to ShowDialog
This updates the code to match the desired interface as specified in the bug. BUG=157161 Review URL: https://chromiumcodereview.appspot.com/12342049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185125 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm2
-rw-r--r--chrome/browser/ui/gtk/constrained_window_gtk.cc2
-rw-r--r--chrome/browser/ui/views/constrained_window_views.cc2
-rw-r--r--chrome/browser/ui/web_contents_modal_dialog_manager.cc2
-rw-r--r--chrome/browser/ui/web_contents_modal_dialog_manager.h6
-rw-r--r--chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc2
6 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm
index 7240b9a..16de59e 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm
@@ -29,7 +29,7 @@ ConstrainedWindowMac::ConstrainedWindowMac(
DCHECK(sheet_.get());
WebContentsModalDialogManager* web_contents_modal_dialog_manager =
WebContentsModalDialogManager::FromWebContents(web_contents);
- web_contents_modal_dialog_manager->AddDialog(this);
+ web_contents_modal_dialog_manager->ShowDialog(this);
registrar_.Add(this,
content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc
index e8b0829..1cec4db 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc
@@ -80,7 +80,7 @@ ConstrainedWindowGtk::ConstrainedWindowGtk(
WebContentsModalDialogManager* web_contents_modal_dialog_manager =
WebContentsModalDialogManager::FromWebContents(web_contents_);
- web_contents_modal_dialog_manager->AddDialog(widget());
+ web_contents_modal_dialog_manager->ShowDialog(widget());
}
ConstrainedWindowGtk::~ConstrainedWindowGtk() {
diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc
index 0b21d96..8b0c79b 100644
--- a/chrome/browser/ui/views/constrained_window_views.cc
+++ b/chrome/browser/ui/views/constrained_window_views.cc
@@ -625,7 +625,7 @@ ConstrainedWindowViews* ConstrainedWindowViews::Create(
web_contents->GetView()->GetNativeView(),
web_contents->GetBrowserContext()->IsOffTheRecord(),
widget_delegate);
- manager->AddDialog(dialog->GetNativeView());
+ manager->ShowDialog(dialog->GetNativeView());
return dialog;
}
diff --git a/chrome/browser/ui/web_contents_modal_dialog_manager.cc b/chrome/browser/ui/web_contents_modal_dialog_manager.cc
index dedb704..2f0ad92 100644
--- a/chrome/browser/ui/web_contents_modal_dialog_manager.cc
+++ b/chrome/browser/ui/web_contents_modal_dialog_manager.cc
@@ -20,7 +20,7 @@ WebContentsModalDialogManager::~WebContentsModalDialogManager() {
DCHECK(child_dialogs_.empty());
}
-void WebContentsModalDialogManager::AddDialog(
+void WebContentsModalDialogManager::ShowDialog(
NativeWebContentsModalDialog dialog) {
child_dialogs_.push_back(dialog);
diff --git a/chrome/browser/ui/web_contents_modal_dialog_manager.h b/chrome/browser/ui/web_contents_modal_dialog_manager.h
index 8b7e6ee..9b3fba7 100644
--- a/chrome/browser/ui/web_contents_modal_dialog_manager.h
+++ b/chrome/browser/ui/web_contents_modal_dialog_manager.h
@@ -29,9 +29,9 @@ class WebContentsModalDialogManager
static NativeWebContentsModalDialogManager* CreateNativeManager(
NativeWebContentsModalDialogManagerDelegate* native_delegate);
- // Adds the given dialog to the list of child dialogs. The dialog will notify
- // via WillClose() when it is being destroyed.
- void AddDialog(NativeWebContentsModalDialog dialog);
+ // Shows the dialog as a web contents modal dialog. The dialog will notify via
+ // WillClose() when it is being destroyed.
+ void ShowDialog(NativeWebContentsModalDialog dialog);
// Blocks/unblocks interaction with renderer process.
void BlockWebContentsInteraction(bool blocked);
diff --git a/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc b/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
index 7847039..037c16d 100644
--- a/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
+++ b/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
@@ -68,7 +68,7 @@ TEST_F(WebContentsModalDialogManagerTest, WebContentsModalDialogs) {
// WebContentsModalDialogManager treats the NativeWebContentsModalDialog as
// an opaque type, so creating fake NativeWebContentsModalDialogs using
// reinterpret_cast is valid.
- web_contents_modal_dialog_manager->AddDialog(
+ web_contents_modal_dialog_manager->ShowDialog(
reinterpret_cast<NativeWebContentsModalDialog>(i));
EXPECT_EQ(native_manager->close_count, 0);