diff options
| author | maniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 21:27:10 +0000 |
|---|---|---|
| committer | maniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 21:27:10 +0000 |
| commit | 53fcb056e4bb554be6cbbd784a22d914ea97fd2a (patch) | |
| tree | c8c51e7b3069ff3d012d1b4f2bf77f2aec567b52 /chrome/browser/plugins | |
| parent | 70f432b008b2bc128e616a7b1bc2382b6abb4ff5 (diff) | |
| download | chromium_src-53fcb056e4bb554be6cbbd784a22d914ea97fd2a.zip chromium_src-53fcb056e4bb554be6cbbd784a22d914ea97fd2a.tar.gz chromium_src-53fcb056e4bb554be6cbbd784a22d914ea97fd2a.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/plugins')
| -rw-r--r-- | chrome/browser/plugins/plugin_observer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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()); } |