diff options
Diffstat (limited to 'chrome/browser/ui/views')
39 files changed, 111 insertions, 153 deletions
diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index 0227d4e..48201d9 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -529,11 +529,10 @@ void AboutChromeView::ViewHierarchyChanged(bool is_add, //////////////////////////////////////////////////////////////////////////////// // AboutChromeView, views::DialogDelegate implementation: -string16 AboutChromeView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) { +string16 AboutChromeView::GetDialogButtonLabel(ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) { return l10n_util::GetStringUTF16(IDS_RELAUNCH_AND_UPDATE); - } else if (button == ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) { + } else if (button == ui::DIALOG_BUTTON_CANCEL) { if (restart_button_visible_) return l10n_util::GetStringUTF16(IDS_NOT_NOW); // The OK button (which is the default button) has been re-purposed to be @@ -550,19 +549,15 @@ string16 AboutChromeView::GetWindowTitle() const { return l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE); } -bool AboutChromeView::IsDialogButtonEnabled( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK && - !restart_button_visible_) +bool AboutChromeView::IsDialogButtonEnabled(ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK && !restart_button_visible_) return false; return true; } -bool AboutChromeView::IsDialogButtonVisible( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK && - !restart_button_visible_) +bool AboutChromeView::IsDialogButtonVisible(ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK && !restart_button_visible_) return false; return true; @@ -573,7 +568,7 @@ bool AboutChromeView::IsDialogButtonVisible( // OK button (which is the dialog cancel button, see GetDialogButtonLabel // above). int AboutChromeView::GetDefaultDialogButton() const { - return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::DIALOG_BUTTON_CANCEL; } bool AboutChromeView::CanResize() const { diff --git a/chrome/browser/ui/views/about_chrome_view.h b/chrome/browser/ui/views/about_chrome_view.h index e8ef825..09cb7b5 100644 --- a/chrome/browser/ui/views/about_chrome_view.h +++ b/chrome/browser/ui/views/about_chrome_view.h @@ -56,12 +56,9 @@ class AboutChromeView : public views::DialogDelegateView, views::View* child) OVERRIDE; // Overridden from views::DialogDelegate: - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; - virtual bool IsDialogButtonEnabled( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; - virtual bool IsDialogButtonVisible( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; + virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; + virtual bool IsDialogButtonVisible(ui::DialogButton button) const OVERRIDE; virtual int GetDefaultDialogButton() const OVERRIDE; virtual bool CanResize() const OVERRIDE; virtual bool CanMaximize() const OVERRIDE; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 18cdc5e..580a63e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -88,14 +88,13 @@ BookmarkEditorView::~BookmarkEditorView() { } string16 BookmarkEditorView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) return l10n_util::GetStringUTF16(IDS_SAVE); return string16(); } -bool BookmarkEditorView::IsDialogButtonEnabled( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) { +bool BookmarkEditorView::IsDialogButtonEnabled(ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) { if (details_.type == EditDetails::NEW_FOLDER) return !title_tf_.text().empty(); @@ -118,7 +117,7 @@ string16 BookmarkEditorView::GetWindowTitle() const { } bool BookmarkEditorView::Accept() { - if (!IsDialogButtonEnabled(ui::MessageBoxFlags::DIALOGBUTTON_OK)) { + if (!IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK)) { if (details_.type != EditDetails::NEW_FOLDER) { // The url is invalid, focus the url field. url_tf_->SelectAll(); @@ -131,8 +130,7 @@ bool BookmarkEditorView::Accept() { return true; } -bool BookmarkEditorView::AreAcceleratorsEnabled( - ui::MessageBoxFlags::DialogButton button) { +bool BookmarkEditorView::AreAcceleratorsEnabled(ui::DialogButton button) { return !show_tree_ || !tree_view_->GetEditingNode(); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h index cf807fc..5a35564 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h @@ -81,16 +81,13 @@ class BookmarkEditorView : public BookmarkEditor, virtual ~BookmarkEditorView(); // views::DialogDelegateView: - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; - virtual bool IsDialogButtonEnabled( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; + virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; virtual bool IsModal() const OVERRIDE; virtual bool CanResize() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual bool Accept() OVERRIDE; - virtual bool AreAcceleratorsEnabled( - ui::MessageBoxFlags::DialogButton button) OVERRIDE; + virtual bool AreAcceleratorsEnabled(ui::DialogButton button) OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; // views::View: diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index 14f21c0..3e78b2d 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -360,11 +360,11 @@ string16 CollectedCookiesWin::GetWindowTitle() const { } int CollectedCookiesWin::GetDialogButtons() const { - return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::DIALOG_BUTTON_CANCEL; } string16 CollectedCookiesWin::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { + ui::DialogButton button) const { return l10n_util::GetStringUTF16(IDS_CLOSE); } diff --git a/chrome/browser/ui/views/collected_cookies_win.h b/chrome/browser/ui/views/collected_cookies_win.h index a0ec632..28d8e58 100644 --- a/chrome/browser/ui/views/collected_cookies_win.h +++ b/chrome/browser/ui/views/collected_cookies_win.h @@ -46,8 +46,7 @@ class CollectedCookiesWin : public views::DialogDelegate, // views::DialogDelegate: virtual string16 GetWindowTitle() const OVERRIDE; virtual int GetDialogButtons() const OVERRIDE; - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual void DeleteDelegate() OVERRIDE; virtual bool Cancel() OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index b99d29d..86efb87 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -324,15 +324,15 @@ gfx::Size CreateApplicationShortcutView::GetPreferredSize() { } string16 CreateApplicationShortcutView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) return l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_COMMIT); return string16(); } bool CreateApplicationShortcutView::IsDialogButtonEnabled( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) return desktop_check_box_->checked() || ((menu_check_box_ != NULL) && menu_check_box_->checked()) || @@ -359,7 +359,7 @@ string16 CreateApplicationShortcutView::GetWindowTitle() const { } bool CreateApplicationShortcutView::Accept() { - if (!IsDialogButtonEnabled(ui::MessageBoxFlags::DIALOGBUTTON_OK)) + if (!IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK)) return false; shortcut_info_.create_on_desktop = desktop_check_box_->checked(); diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h index 42fde8f..9dc23b5 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.h +++ b/chrome/browser/ui/views/create_application_shortcut_view.h @@ -43,10 +43,8 @@ class CreateApplicationShortcutView : public views::DialogDelegateView, virtual gfx::Size GetPreferredSize() OVERRIDE; // Overridden from views::DialogDelegate: - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; - virtual bool IsDialogButtonEnabled( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; + virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; virtual bool CanResize() const OVERRIDE; virtual bool CanMaximize() const OVERRIDE; virtual bool IsModal() const OVERRIDE; diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index c2187a6..f4fe436 100644 --- a/chrome/browser/ui/views/default_search_view.cc +++ b/chrome/browser/ui/views/default_search_view.cc @@ -20,7 +20,6 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/message_box_flags.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "views/controls/button/text_button.h" @@ -165,7 +164,7 @@ views::View* DefaultSearchView::GetContentsView() { } int DefaultSearchView::GetDialogButtons() const { - return ui::MessageBoxFlags::DIALOGBUTTON_NONE; + return ui::DIALOG_BUTTON_NONE; } bool DefaultSearchView::Accept() { diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc index e809de1..f785137 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc @@ -110,16 +110,16 @@ gfx::Size DownloadInProgressDialogView::GetPreferredSize() { } string16 DownloadInProgressDialogView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) return ok_button_text_; - DCHECK_EQ(ui::MessageBoxFlags::DIALOGBUTTON_CANCEL, button); + DCHECK_EQ(ui::DIALOG_BUTTON_CANCEL, button); return cancel_button_text_; } int DownloadInProgressDialogView::GetDefaultDialogButton() const { - return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::DIALOG_BUTTON_CANCEL; } bool DownloadInProgressDialogView::Cancel() { diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h index b21593f..f61ae40 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h @@ -34,8 +34,7 @@ class DownloadInProgressDialogView : public views::DialogDelegateView { virtual gfx::Size GetPreferredSize() OVERRIDE; // views::DialogDelegateView: - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual int GetDefaultDialogButton() const OVERRIDE; virtual bool Cancel() OVERRIDE; virtual bool Accept() OVERRIDE; diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 9bbe778..d5713ec 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -84,8 +84,8 @@ string16 EditSearchEngineDialog::GetWindowTitle() const { } bool EditSearchEngineDialog::IsDialogButtonEnabled( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) { + ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) { return (controller_->IsKeywordValid(keyword_tf_->text()) && controller_->IsTitleValid(title_tf_->text()) && controller_->IsURLValid(UTF16ToUTF8(url_tf_->text()))); diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.h b/chrome/browser/ui/views/edit_search_engine_dialog.h index cde395e..f8fa7de 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.h +++ b/chrome/browser/ui/views/edit_search_engine_dialog.h @@ -45,8 +45,7 @@ class EditSearchEngineDialog : public views::TextfieldController, // views::DialogDelegate: virtual bool IsModal() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; - virtual bool IsDialogButtonEnabled( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; virtual bool Cancel() OVERRIDE; virtual bool Accept() OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index 38842de..9d2d4f5 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -71,8 +71,7 @@ class ExtensionInstallDialogView : public views::DialogDelegateView, private: // views::DialogDelegateView: - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual int GetDefaultDialogButton() const OVERRIDE; virtual bool Cancel() OVERRIDE; virtual bool Accept() OVERRIDE; @@ -256,11 +255,11 @@ ExtensionInstallDialogView::~ExtensionInstallDialogView() { } string16 ExtensionInstallDialogView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { + ui::DialogButton button) const { switch (button) { - case ui::MessageBoxFlags::DIALOGBUTTON_OK: + case ui::DIALOG_BUTTON_OK: return prompt_.GetAcceptButtonLabel(); - case ui::MessageBoxFlags::DIALOGBUTTON_CANCEL: + case ui::DIALOG_BUTTON_CANCEL: return prompt_.HasAbortButtonLabel() ? prompt_.GetAbortButtonLabel() : l10n_util::GetStringUTF16(IDS_CANCEL); @@ -271,7 +270,7 @@ string16 ExtensionInstallDialogView::GetDialogButtonLabel( } int ExtensionInstallDialogView::GetDefaultDialogButton() const { - return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::DIALOG_BUTTON_CANCEL; } bool ExtensionInstallDialogView::Cancel() { diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc index 0b454ab..269ffe2 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -66,13 +66,10 @@ class ExtensionUninstallDialogDelegateView : public views::DialogDelegateView { private: // views::DialogDelegate: - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; - + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual int GetDefaultDialogButton() const OVERRIDE { - return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::DIALOG_BUTTON_CANCEL; } - virtual bool Accept() OVERRIDE; virtual bool Cancel() OVERRIDE; @@ -160,11 +157,11 @@ ExtensionUninstallDialogDelegateView::~ExtensionUninstallDialogDelegateView() { } string16 ExtensionUninstallDialogDelegateView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { + ui::DialogButton button) const { switch (button) { - case ui::MessageBoxFlags::DIALOGBUTTON_OK: + case ui::DIALOG_BUTTON_OK: return l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON); - case ui::MessageBoxFlags::DIALOGBUTTON_CANCEL: + case ui::DIALOG_BUTTON_CANCEL: return l10n_util::GetStringUTF16(IDS_CANCEL); default: NOTREACHED(); diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc index e2bae68..ff78453 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.cc +++ b/chrome/browser/ui/views/external_protocol_dialog.cc @@ -56,12 +56,12 @@ ExternalProtocolDialog::~ExternalProtocolDialog() { // ExternalProtocolDialog, views::DialogDelegate implementation: int ExternalProtocolDialog::GetDefaultDialogButton() const { - return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::DIALOG_BUTTON_CANCEL; } string16 ExternalProtocolDialog::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_OK_BUTTON_TEXT); else return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_CANCEL_BUTTON_TEXT); diff --git a/chrome/browser/ui/views/external_protocol_dialog.h b/chrome/browser/ui/views/external_protocol_dialog.h index 5a17235..d6344cd9 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.h +++ b/chrome/browser/ui/views/external_protocol_dialog.h @@ -33,8 +33,7 @@ class ExternalProtocolDialog : public views::DialogDelegate { // views::DialogDelegate methods: virtual int GetDefaultDialogButton() const OVERRIDE; - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual void DeleteDelegate() OVERRIDE; virtual bool Cancel() OVERRIDE; diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index abd6698..18120fd 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -238,8 +238,7 @@ class HungRendererDialogView : public views::DialogDelegateView, virtual string16 GetWindowTitle() const OVERRIDE; virtual void WindowClosing() OVERRIDE; virtual int GetDialogButtons() const OVERRIDE; - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual views::View* GetExtraView() OVERRIDE; virtual bool Accept(bool window_closing) OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; @@ -383,12 +382,12 @@ int HungRendererDialogView::GetDialogButtons() const { // the OK button to wait for responsiveness (and close the dialog) and our // additional button (which we create) to kill the process (which will result // in the dialog being destroyed). - return ui::MessageBoxFlags::DIALOGBUTTON_OK; + return ui::DIALOG_BUTTON_OK; } string16 HungRendererDialogView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) return l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_WAIT); return string16(); } diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc index 1bebc9a..404b26c 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc @@ -66,10 +66,10 @@ void ImportLockDialogView::Layout() { } string16 ImportLockDialogView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) return l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_OK); - else if (button == ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) + else if (button == ui::DIALOG_BUTTON_CANCEL) return l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_CANCEL); return string16(); } diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.h b/chrome/browser/ui/views/importer/import_lock_dialog_view.h index e35991b..d2e551c 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.h +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.h @@ -33,8 +33,7 @@ class ImportLockDialogView : public views::DialogDelegateView { virtual void Layout() OVERRIDE; // views::DialogDelegate: - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual bool IsModal() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual bool Accept() OVERRIDE; diff --git a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc index 6ced146..9cb7dee 100644 --- a/chrome/browser/ui/views/importer/import_progress_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.cc @@ -111,12 +111,12 @@ void ImportProgressDialogView::ViewHierarchyChanged(bool is_add, } int ImportProgressDialogView::GetDialogButtons() const { - return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::DIALOG_BUTTON_CANCEL; } string16 ImportProgressDialogView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - DCHECK_EQ(button, ui::MessageBoxFlags::DIALOGBUTTON_CANCEL); + ui::DialogButton button) const { + DCHECK_EQ(button, ui::DIALOG_BUTTON_CANCEL); return l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_CANCEL); } diff --git a/chrome/browser/ui/views/importer/import_progress_dialog_view.h b/chrome/browser/ui/views/importer/import_progress_dialog_view.h index 1afcd16..be40bea 100644 --- a/chrome/browser/ui/views/importer/import_progress_dialog_view.h +++ b/chrome/browser/ui/views/importer/import_progress_dialog_view.h @@ -46,8 +46,7 @@ class ImportProgressDialogView : public views::DialogDelegateView, // views::DialogDelegate: virtual int GetDialogButtons() const OVERRIDE; - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual bool IsModal() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual bool Cancel() OVERRIDE; diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index 24f7bd7..683b845 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -71,21 +71,21 @@ void JSModalDialogViews::CancelAppModalDialog() { int JSModalDialogViews::GetDefaultDialogButton() const { if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasOKButton) - return ui::MessageBoxFlags::DIALOGBUTTON_OK; + return ui::DIALOG_BUTTON_OK; if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasCancelButton) - return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::DIALOG_BUTTON_CANCEL; - return ui::MessageBoxFlags::DIALOGBUTTON_NONE; + return ui::DIALOG_BUTTON_NONE; } int JSModalDialogViews::GetDialogButtons() const { int dialog_buttons = 0; if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasOKButton) - dialog_buttons = ui::MessageBoxFlags::DIALOGBUTTON_OK; + dialog_buttons = ui::DIALOG_BUTTON_OK; if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasCancelButton) - dialog_buttons |= ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + dialog_buttons |= ui::DIALOG_BUTTON_CANCEL; return dialog_buttons; } @@ -127,12 +127,12 @@ const views::Widget* JSModalDialogViews::GetWidget() const { } string16 JSModalDialogViews::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { + ui::DialogButton button) const { if (parent_->is_before_unload_dialog()) { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) { + if (button == ui::DIALOG_BUTTON_OK) { return l10n_util::GetStringUTF16( IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL); - } else if (button == ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) { + } else if (button == ui::DIALOG_BUTTON_CANCEL) { return l10n_util::GetStringUTF16( IDS_BEFOREUNLOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL); } diff --git a/chrome/browser/ui/views/js_modal_dialog_views.h b/chrome/browser/ui/views/js_modal_dialog_views.h index 847ecbb..e77247b 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.h +++ b/chrome/browser/ui/views/js_modal_dialog_views.h @@ -6,12 +6,10 @@ #define CHROME_BROWSER_UI_VIEWS_JS_MODAL_DIALOG_VIEWS_H_ #pragma once -#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" - #include <string> +#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" -#include "ui/base/message_box_flags.h" #include "views/window/dialog_delegate.h" namespace views { @@ -40,8 +38,7 @@ class JSModalDialogViews : public NativeAppModalDialog, virtual void DeleteDelegate() OVERRIDE; virtual bool Cancel() OVERRIDE; virtual bool Accept() OVERRIDE; - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; // Overridden from views::WidgetDelegate: virtual bool IsModal() const OVERRIDE; diff --git a/chrome/browser/ui/views/repost_form_warning_view.cc b/chrome/browser/ui/views/repost_form_warning_view.cc index 0dec119..c7ade24 100644 --- a/chrome/browser/ui/views/repost_form_warning_view.cc +++ b/chrome/browser/ui/views/repost_form_warning_view.cc @@ -55,10 +55,10 @@ string16 RepostFormWarningView::GetWindowTitle() const { } string16 RepostFormWarningView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) return l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING_RESEND); - if (button == ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) + if (button == ui::DIALOG_BUTTON_CANCEL) return l10n_util::GetStringUTF16(IDS_CANCEL); return string16(); } diff --git a/chrome/browser/ui/views/repost_form_warning_view.h b/chrome/browser/ui/views/repost_form_warning_view.h index 82f1d21..b98bdc9 100644 --- a/chrome/browser/ui/views/repost_form_warning_view.h +++ b/chrome/browser/ui/views/repost_form_warning_view.h @@ -29,16 +29,14 @@ class RepostFormWarningView : public views::DialogDelegate { RepostFormWarningView(gfx::NativeWindow parent_window, TabContents* tab_contents); - // views::DialogDelegate Methods: + // views::DialogDelegate: virtual string16 GetWindowTitle() const OVERRIDE; - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual void DeleteDelegate() OVERRIDE; - virtual bool Cancel() OVERRIDE; virtual bool Accept() OVERRIDE; - // views::WidgetDelegate Methods: + // views::WidgetDelegate: virtual views::View* GetContentsView() OVERRIDE; virtual views::Widget* GetWidget() OVERRIDE; virtual const views::Widget* GetWidget() const OVERRIDE; diff --git a/chrome/browser/ui/views/restart_message_box.cc b/chrome/browser/ui/views/restart_message_box.cc index 807dec0..fd40269 100644 --- a/chrome/browser/ui/views/restart_message_box.cc +++ b/chrome/browser/ui/views/restart_message_box.cc @@ -22,12 +22,12 @@ void RestartMessageBox::ShowMessageBox(gfx::NativeWindow parent_window) { } int RestartMessageBox::GetDialogButtons() const { - return ui::MessageBoxFlags::DIALOGBUTTON_OK; + return ui::DIALOG_BUTTON_OK; } string16 RestartMessageBox::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - DCHECK(button == ui::MessageBoxFlags::DIALOGBUTTON_OK); + ui::DialogButton button) const { + DCHECK_EQ(button, ui::DIALOG_BUTTON_OK); return l10n_util::GetStringUTF16(IDS_OK); } diff --git a/chrome/browser/ui/views/restart_message_box.h b/chrome/browser/ui/views/restart_message_box.h index 68dccce..47be2ab 100644 --- a/chrome/browser/ui/views/restart_message_box.h +++ b/chrome/browser/ui/views/restart_message_box.h @@ -24,8 +24,7 @@ class RestartMessageBox : public views::DialogDelegate { protected: // views::DialogDelegate: virtual int GetDialogButtons() const OVERRIDE; - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; // views::WidgetDelegate: diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc index 78cab40..6d9c100 100644 --- a/chrome/browser/ui/views/simple_message_box_views.cc +++ b/chrome/browser/ui/views/simple_message_box_views.cc @@ -10,6 +10,7 @@ #include "chrome/browser/ui/views/window.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/message_box_flags.h" #include "views/controls/message_box_view.h" #include "views/widget/widget.h" @@ -86,16 +87,15 @@ int SimpleMessageBoxViews::GetDialogButtons() const { // NOTE: It seems unsafe to assume that the flags for OK/cancel will always // have the same value as the button ids. return (dialog_flags_ & ui::MessageBoxFlags::kFlagHasOKButton - ? ui::MessageBoxFlags::DIALOGBUTTON_OK : 0) | + ? ui::DIALOG_BUTTON_OK : 0) | (dialog_flags_ & ui::MessageBoxFlags::kFlagHasCancelButton - ? ui::MessageBoxFlags::DIALOGBUTTON_CANCEL : 0); + ? ui::DIALOG_BUTTON_CANCEL : 0); } string16 SimpleMessageBoxViews::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - return button == ui::MessageBoxFlags::DIALOGBUTTON_OK ? - l10n_util::GetStringUTF16(IDS_OK) : - l10n_util::GetStringUTF16(IDS_CLOSE); + ui::DialogButton button) const { + return button == ui::DIALOG_BUTTON_OK ? l10n_util::GetStringUTF16(IDS_OK) + : l10n_util::GetStringUTF16(IDS_CLOSE); } bool SimpleMessageBoxViews::ShouldShowWindowTitle() const { diff --git a/chrome/browser/ui/views/simple_message_box_views.h b/chrome/browser/ui/views/simple_message_box_views.h index fc17f61..f73475c 100644 --- a/chrome/browser/ui/views/simple_message_box_views.h +++ b/chrome/browser/ui/views/simple_message_box_views.h @@ -50,8 +50,7 @@ class SimpleMessageBoxViews : public views::DialogDelegate, protected: // Overridden from views::DialogDelegate: virtual int GetDialogButtons() const OVERRIDE; - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; // Overridden from views::WidgetDelegate: virtual bool ShouldShowWindowTitle() const OVERRIDE; diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index ca11011..3d74cac 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -177,8 +177,8 @@ void SSLClientCertificateSelector::DeleteDelegate() { } bool SSLClientCertificateSelector::IsDialogButtonEnabled( - ui::MessageBoxFlags::DialogButton button) const { - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + ui::DialogButton button) const { + if (button == ui::DIALOG_BUTTON_OK) return !!GetSelectedCert(); return true; } diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h index 531c46e..85de297 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.h +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h @@ -10,10 +10,9 @@ #include <vector> #include "base/basictypes.h" -#include "base/string16.h" #include "base/memory/ref_counted.h" +#include "base/string16.h" #include "content/browser/ssl/ssl_client_auth_handler.h" -#include "ui/base/message_box_flags.h" #include "views/controls/button/button.h" #include "views/controls/table/table_view_observer.h" #include "views/view.h" @@ -54,8 +53,7 @@ class SSLClientCertificateSelector : public SSLClientAuthObserver, virtual bool CanResize() const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual void DeleteDelegate() OVERRIDE; - virtual bool IsDialogButtonEnabled( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; virtual bool Cancel() OVERRIDE; virtual bool Accept() OVERRIDE; virtual views::View* GetInitiallyFocusedView() OVERRIDE; diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index ea04877..766492b 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -661,7 +661,7 @@ std::string TaskManagerView::GetWindowName() const { } int TaskManagerView::GetDialogButtons() const { - return ui::MessageBoxFlags::DIALOGBUTTON_NONE; + return ui::DIALOG_BUTTON_NONE; } void TaskManagerView::WindowClosing() { diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc index 3de2a97..1dd1341 100644 --- a/chrome/browser/ui/views/uninstall_view.cc +++ b/chrome/browser/ui/views/uninstall_view.cc @@ -116,17 +116,16 @@ bool UninstallView::Cancel() { return true; } -string16 UninstallView::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { +string16 UninstallView::GetDialogButtonLabel(ui::DialogButton button) const { // We only want to give custom name to OK button - 'Uninstall'. Cancel // button remains same. - if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + if (button == ui::DIALOG_BUTTON_OK) return l10n_util::GetStringUTF16(IDS_UNINSTALL_BUTTON_TEXT); return string16(); } -void UninstallView::ButtonPressed( - views::Button* sender, const views::Event& event) { +void UninstallView::ButtonPressed(views::Button* sender, + const views::Event& event) { if (change_default_browser_ == sender) { // Disable the browsers combobox if the user unchecks the checkbox. DCHECK(browsers_combo_); diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h index d167dab..cdbbed2 100644 --- a/chrome/browser/ui/views/uninstall_view.h +++ b/chrome/browser/ui/views/uninstall_view.h @@ -35,8 +35,7 @@ class UninstallView : public views::ButtonListener, // Overridden from views::DialogDelegateView: virtual bool Accept() OVERRIDE; virtual bool Cancel() OVERRIDE; - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; // Overridden from views::WidgetDelegate: virtual string16 GetWindowTitle() const OVERRIDE; diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index 1d30247..af0d559 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc @@ -40,15 +40,13 @@ bool UpdateRecommendedMessageBox::Accept() { } int UpdateRecommendedMessageBox::GetDialogButtons() const { - return ui::MessageBoxFlags::DIALOGBUTTON_OK | - ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL; } string16 UpdateRecommendedMessageBox::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { - DCHECK(button == ui::MessageBoxFlags::DIALOGBUTTON_OK || - button == ui::MessageBoxFlags::DIALOGBUTTON_CANCEL); - return button == ui::MessageBoxFlags::DIALOGBUTTON_OK ? + ui::DialogButton button) const { + DCHECK(button == ui::DIALOG_BUTTON_OK || button == ui::DIALOG_BUTTON_CANCEL); + return button == ui::DIALOG_BUTTON_OK ? l10n_util::GetStringUTF16(IDS_RELAUNCH_AND_UPDATE) : l10n_util::GetStringUTF16(IDS_NOT_NOW); } diff --git a/chrome/browser/ui/views/update_recommended_message_box.h b/chrome/browser/ui/views/update_recommended_message_box.h index d548a20..aeae44a 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.h +++ b/chrome/browser/ui/views/update_recommended_message_box.h @@ -27,8 +27,7 @@ class UpdateRecommendedMessageBox : public views::DialogDelegate { protected: // Overridden from views::DialogDelegate: virtual int GetDialogButtons() const OVERRIDE; - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; // Overridden from views::WidgetDelegate: virtual bool ShouldShowWindowTitle() const OVERRIDE; diff --git a/chrome/browser/ui/views/user_data_dir_dialog.cc b/chrome/browser/ui/views/user_data_dir_dialog.cc index 6a1c54f..4167552 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog.cc +++ b/chrome/browser/ui/views/user_data_dir_dialog.cc @@ -43,12 +43,12 @@ UserDataDirDialog::~UserDataDirDialog() { } string16 UserDataDirDialog::GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const { + ui::DialogButton button) const { switch (button) { - case ui::MessageBoxFlags::DIALOGBUTTON_OK: + case ui::DIALOG_BUTTON_OK: return l10n_util::GetStringUTF16( IDS_CANT_WRITE_USER_DIRECTORY_CHOOSE_DIRECTORY_BUTTON); - case ui::MessageBoxFlags::DIALOGBUTTON_CANCEL: + case ui::DIALOG_BUTTON_CANCEL: return l10n_util::GetStringUTF16( IDS_CANT_WRITE_USER_DIRECTORY_EXIT_BUTTON); default: diff --git a/chrome/browser/ui/views/user_data_dir_dialog.h b/chrome/browser/ui/views/user_data_dir_dialog.h index 87479be..8709747 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog.h +++ b/chrome/browser/ui/views/user_data_dir_dialog.h @@ -34,8 +34,7 @@ class UserDataDirDialog : public views::DialogDelegate, FilePath user_data_dir() const { return user_data_dir_; } // views::DialogDelegate methods: - virtual string16 GetDialogButtonLabel( - ui::MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; virtual string16 GetWindowTitle() const OVERRIDE; virtual void DeleteDelegate() OVERRIDE; virtual bool Accept() OVERRIDE; |