Rename TabModalConfirmDialogCloseDelegate's GetMessage to GetDialogMessage.

Renaming to avoid a namespace conflict.  windows.h #defines GetMessage.  A
future patch will introduce a header include that causes windows.h to be
(transitively) included by tab_modal_confirm_dialog_browsertest.h.

BUG=

Review URL: https://codereview.chromium.org/136963006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249108 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 15 insertions, 15 deletions

diff --git a/chrome/browser/download/download_danger_prompt.cc b/chrome/browser/download/download_danger_prompt.cc
index dee04f0..03c410d 100644
--- a/chrome/browser/download/download_danger_prompt.cc
+++ b/chrome/browser/download/download_danger_prompt.cc
@@ -43,7 +43,7 @@ class DownloadDangerPromptImpl : public DownloadDangerPrompt,
 
   // TabModalConfirmDialogDelegate:
   virtual base::string16 GetTitle() OVERRIDE;
-  virtual base::string16 GetMessage() OVERRIDE;
+  virtual base::string16 GetDialogMessage() OVERRIDE;
   virtual base::string16 GetAcceptButtonTitle() OVERRIDE;
   virtual base::string16 GetCancelButtonTitle() OVERRIDE;
   virtual void OnAccepted() OVERRIDE;
@@ -119,7 +119,7 @@ base::string16 DownloadDangerPromptImpl::GetTitle() {
   }
 }
 
-base::string16 DownloadDangerPromptImpl::GetMessage() {
+base::string16 DownloadDangerPromptImpl::GetDialogMessage() {
   if (show_context_) {
     switch (download_->GetDangerType()) {
       case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE: {
diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc
index e1283f5..3d2eb2e 100644
--- a/chrome/browser/plugins/plugin_observer.cc
+++ b/chrome/browser/plugins/plugin_observer.cc
@@ -65,7 +65,7 @@ class ConfirmInstallDialogDelegate : public TabModalConfirmDialogDelegate,
 
   // TabModalConfirmDialogDelegate methods:
   virtual base::string16 GetTitle() OVERRIDE;
-  virtual base::string16 GetMessage() OVERRIDE;
+  virtual base::string16 GetDialogMessage() OVERRIDE;
   virtual base::string16 GetAcceptButtonTitle() OVERRIDE;
   virtual void OnAccepted() OVERRIDE;
   virtual void OnCanceled() OVERRIDE;
@@ -94,7 +94,7 @@ base::string16 ConfirmInstallDialogDelegate::GetTitle() {
       IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_TITLE, plugin_metadata_->name());
 }
 
-base::string16 ConfirmInstallDialogDelegate::GetMessage() {
+base::string16 ConfirmInstallDialogDelegate::GetDialogMessage() {
   return l10n_util::GetStringFUTF16(IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_MSG,
                                     plugin_metadata_->name());
 }
diff --git a/chrome/browser/repost_form_warning_controller.cc b/chrome/browser/repost_form_warning_controller.cc
index 68a8c96..857a5b8 100644
--- a/chrome/browser/repost_form_warning_controller.cc
+++ b/chrome/browser/repost_form_warning_controller.cc
@@ -26,7 +26,7 @@ base::string16 RepostFormWarningController::GetTitle() {
   return l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING_TITLE);
 }
 
-base::string16 RepostFormWarningController::GetMessage() {
+base::string16 RepostFormWarningController::GetDialogMessage() {
   return l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING);
 }
 
diff --git a/chrome/browser/repost_form_warning_controller.h b/chrome/browser/repost_form_warning_controller.h
index 68fc612..9d977d2 100644
--- a/chrome/browser/repost_form_warning_controller.h
+++ b/chrome/browser/repost_form_warning_controller.h
@@ -21,7 +21,7 @@ class RepostFormWarningController : public TabModalConfirmDialogDelegate,
  private:
   // TabModalConfirmDialogDelegate methods:
   virtual base::string16 GetTitle() OVERRIDE;
-  virtual base::string16 GetMessage() OVERRIDE;
+  virtual base::string16 GetDialogMessage() OVERRIDE;
   virtual base::string16 GetAcceptButtonTitle() OVERRIDE;
 #if defined(TOOLKIT_GTK)
   virtual const char* GetAcceptButtonIcon() OVERRIDE;
diff --git a/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc b/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc
index 955b70b..4b5220e 100644
--- a/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc
+++ b/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc
@@ -22,7 +22,7 @@ class DirectoryAccessConfirmationDialog : public TabModalConfirmDialogDelegate {
                                     const base::Closure& on_cancel);
 
   virtual base::string16 GetTitle() OVERRIDE;
-  virtual base::string16 GetMessage() OVERRIDE;
+  virtual base::string16 GetDialogMessage() OVERRIDE;
   virtual base::string16 GetAcceptButtonTitle() OVERRIDE;
   virtual base::string16 GetCancelButtonTitle() OVERRIDE;
 
@@ -54,7 +54,7 @@ base::string16 DirectoryAccessConfirmationDialog::GetTitle() {
       IDS_EXTENSIONS_DIRECTORY_CONFIRMATION_DIALOG_TITLE);
 }
 
-base::string16 DirectoryAccessConfirmationDialog::GetMessage() {
+base::string16 DirectoryAccessConfirmationDialog::GetDialogMessage() {
   if (writable_) {
     return l10n_util::GetStringFUTF16(
         IDS_EXTENSIONS_DIRECTORY_CONFIRMATION_DIALOG_MESSAGE_WRITABLE,
diff --git a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm
index 7301374..91fd2a7 100644
--- a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm
+++ b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm
@@ -70,7 +70,7 @@ TabModalConfirmDialogMac::TabModalConfirmDialogMac(
                target:bridge_
                action:@selector(onLinkClicked:)];
   [alert_ setInformativeText:
-      l10n_util::FixUpWindowsStyleLabel(delegate->GetMessage())];
+      l10n_util::FixUpWindowsStyleLabel(delegate->GetDialogMessage())];
   [alert_ addButtonWithTitle:
       l10n_util::FixUpWindowsStyleLabel(delegate->GetAcceptButtonTitle())
               keyEquivalent:kKeyEquivalentReturn
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index 8bd6796..0d16574 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -180,7 +180,7 @@ class ConfirmEmailDialogDelegate : public TabModalConfirmDialogDelegate {
 
   // TabModalConfirmDialogDelegate:
   virtual base::string16 GetTitle() OVERRIDE;
-  virtual base::string16 GetMessage() OVERRIDE;
+  virtual base::string16 GetDialogMessage() OVERRIDE;
   virtual base::string16 GetAcceptButtonTitle() OVERRIDE;
   virtual base::string16 GetCancelButtonTitle() OVERRIDE;
   virtual base::string16 GetLinkText() const OVERRIDE;
@@ -230,7 +230,7 @@ base::string16 ConfirmEmailDialogDelegate::GetTitle() {
       IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_TITLE);
 }
 
-base::string16 ConfirmEmailDialogDelegate::GetMessage() {
+base::string16 ConfirmEmailDialogDelegate::GetDialogMessage() {
   return l10n_util::GetStringFUTF16(
       IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_MESSAGE,
       base::UTF8ToUTF16(last_email_), base::UTF8ToUTF16(email_));
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
index ac6526a..5e4b198 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
@@ -30,7 +30,7 @@ base::string16 MockTabModalConfirmDialogDelegate::GetTitle() {
   return base::string16();
 }
 
-base::string16 MockTabModalConfirmDialogDelegate::GetMessage() {
+base::string16 MockTabModalConfirmDialogDelegate::GetDialogMessage() {
   return base::string16();
 }
 
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h
index 93d72b4..f490e19 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h
@@ -27,7 +27,7 @@ class MockTabModalConfirmDialogDelegate : public TabModalConfirmDialogDelegate {
   virtual ~MockTabModalConfirmDialogDelegate();
 
   virtual base::string16 GetTitle() OVERRIDE;
-  virtual base::string16 GetMessage() OVERRIDE;
+  virtual base::string16 GetDialogMessage() OVERRIDE;
 
   virtual void OnAccepted() OVERRIDE;
   virtual void OnCanceled() OVERRIDE;
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h b/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h
index 2aa2130..9be52db 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h
@@ -71,7 +71,7 @@ class TabModalConfirmDialogDelegate : public content::NotificationObserver {
 
   // The title of the dialog. Note that the title is not shown on all platforms.
   virtual base::string16 GetTitle() = 0;
-  virtual base::string16 GetMessage() = 0;
+  virtual base::string16 GetDialogMessage() = 0;
 
   // Icon to show for the dialog. If this method is not overridden, a default
   // icon (like the application icon) is shown.
diff --git a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
index d0bbd9b..cad39c4 100644
--- a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
+++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
@@ -43,7 +43,7 @@ TabModalConfirmDialogViews::TabModalConfirmDialogViews(
     : delegate_(delegate),
       dialog_(NULL),
       browser_context_(web_contents->GetBrowserContext()) {
-  views::MessageBoxView::InitParams init_params(delegate->GetMessage());
+  views::MessageBoxView::InitParams init_params(delegate->GetDialogMessage());
   init_params.inter_row_vertical_spacing =
       views::kUnrelatedControlVerticalSpacing;
   message_box_view_ = new views::MessageBoxView(init_params);