diff options
Diffstat (limited to 'chrome/browser/ui/views')
16 files changed, 74 insertions, 41 deletions
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h index 2117116..c325330 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.h +++ b/chrome/browser/ui/views/create_application_shortcut_view.h @@ -31,8 +31,7 @@ class TabContentsWrapper; // Shortcuts that load a URL in an app-like window, and shortcuts that load // a chrome app (the kind you see under "apps" on the new tabs page) in an app // window. These are implemented as subclasses of CreateShortcutViewCommon. -class CreateApplicationShortcutView : public views::View, - public views::DialogDelegate, +class CreateApplicationShortcutView : public views::DialogDelegateView, public views::ButtonListener { public: explicit CreateApplicationShortcutView(Profile* profile); 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 eac09ae..4d51f74 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 @@ -24,8 +24,7 @@ namespace views { class Label; } -class DownloadInProgressDialogView : public views::View, - public views::DialogDelegate { +class DownloadInProgressDialogView : public views::DialogDelegateView { public: explicit DownloadInProgressDialogView(Browser* browser); virtual ~DownloadInProgressDialogView(); 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 99f4e7e..c647e65 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -61,8 +61,7 @@ const int kHeadingFontSizeDelta = 1; } // namespace // Implements the extension installation dialog for TOOLKIT_VIEWS. -class ExtensionInstallDialogView : public views::View, - public views::DialogDelegate { +class ExtensionInstallDialogView : public views::DialogDelegateView { public: ExtensionInstallDialogView(ExtensionInstallUI::Delegate* delegate, const Extension* extension, 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 74fdd9e..02a5591 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -26,8 +26,7 @@ namespace { const int kRightColumnWidth = 210; const int kIconSize = 69; -class ExtensionUninstallDialogView : public views::View, - public views::DialogDelegate { +class ExtensionUninstallDialogView : public views::DialogDelegateView { public: ExtensionUninstallDialogView(ExtensionUninstallDialog::Delegate* delegate, const Extension* extension, diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc index 99e5ece..8f738c0 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.cc +++ b/chrome/browser/ui/views/external_protocol_dialog.cc @@ -112,6 +112,14 @@ views::View* ExternalProtocolDialog::GetContentsView() { return message_box_view_; } +views::Widget* ExternalProtocolDialog::GetWidget() { + return message_box_view_->GetWidget(); +} + +const views::Widget* ExternalProtocolDialog::GetWidget() const { + return message_box_view_->GetWidget(); +} + /////////////////////////////////////////////////////////////////////////////// // ExternalProtocolDialog, private: diff --git a/chrome/browser/ui/views/external_protocol_dialog.h b/chrome/browser/ui/views/external_protocol_dialog.h index 445131c..f4d4eef 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.h +++ b/chrome/browser/ui/views/external_protocol_dialog.h @@ -30,14 +30,16 @@ class ExternalProtocolDialog : public views::DialogDelegate { virtual ~ExternalProtocolDialog(); // views::DialogDelegate Methods: - virtual int GetDefaultDialogButton() const; + virtual int GetDefaultDialogButton() const OVERRIDE; virtual std::wstring GetDialogButtonLabel( - MessageBoxFlags::DialogButton button) const; - virtual std::wstring GetWindowTitle() const; - virtual void DeleteDelegate(); - virtual bool Cancel(); - virtual bool Accept(); - virtual views::View* GetContentsView(); + MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual std::wstring GetWindowTitle() const OVERRIDE; + virtual void DeleteDelegate() OVERRIDE; + virtual bool Cancel() OVERRIDE; + virtual bool Accept() OVERRIDE; + virtual views::View* GetContentsView() OVERRIDE; + virtual views::Widget* GetWidget() OVERRIDE; + virtual const views::Widget* GetWidget() const OVERRIDE; // views::WindowDelegate Methods: virtual bool IsAlwaysOnTop() const { return false; } 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 91c8b44..b77a082 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.h +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.h @@ -20,8 +20,7 @@ class ImporterHost; // ImportLockDialogView asks the user to shut down Firefox before starting the // profile import. -class ImportLockDialogView : public views::View, - public views::DialogDelegate { +class ImportLockDialogView : public views::DialogDelegateView { public: static void Show(gfx::NativeWindow parent, ImporterHost* importer_host); diff --git a/chrome/browser/ui/views/instant_confirm_view.h b/chrome/browser/ui/views/instant_confirm_view.h index 13bb1d4..6f859f3 100644 --- a/chrome/browser/ui/views/instant_confirm_view.h +++ b/chrome/browser/ui/views/instant_confirm_view.h @@ -15,8 +15,7 @@ class Profile; // The view shown in the instant confirm dialog. -class InstantConfirmView : public views::View, - public views::DialogDelegate, +class InstantConfirmView : public views::DialogDelegateView, public views::LinkListener { public: explicit InstantConfirmView(Profile* profile); diff --git a/chrome/browser/ui/views/notifications/balloon_view.h b/chrome/browser/ui/views/notifications/balloon_view.h index 4c58326..a52598c 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.h +++ b/chrome/browser/ui/views/notifications/balloon_view.h @@ -45,9 +45,8 @@ class SlideAnimation; // A balloon view is the UI component for a desktop notification toasts. // It draws a border, and within the border an HTML renderer. class BalloonViewImpl : public BalloonView, - public views::View, public views::ViewMenuDelegate, - public views::WidgetDelegate, + public views::WidgetDelegateView, public views::ButtonListener, public NotificationObserver, public ui::AnimationDelegate { diff --git a/chrome/browser/ui/views/restart_message_box.cc b/chrome/browser/ui/views/restart_message_box.cc index 6d04555..57077ad 100644 --- a/chrome/browser/ui/views/restart_message_box.cc +++ b/chrome/browser/ui/views/restart_message_box.cc @@ -47,6 +47,14 @@ views::View* RestartMessageBox::GetContentsView() { return message_box_view_; } +views::Widget* RestartMessageBox::GetWidget() { + return message_box_view_->GetWidget(); +} + +const views::Widget* RestartMessageBox::GetWidget() const { + return message_box_view_->GetWidget(); +} + //////////////////////////////////////////////////////////////////////////////// // RestartMessageBox, private: diff --git a/chrome/browser/ui/views/restart_message_box.h b/chrome/browser/ui/views/restart_message_box.h index 6bb87eb..c2f776d 100644 --- a/chrome/browser/ui/views/restart_message_box.h +++ b/chrome/browser/ui/views/restart_message_box.h @@ -23,15 +23,17 @@ class RestartMessageBox : public views::DialogDelegate { protected: // views::DialogDelegate: - virtual int GetDialogButtons() const; + virtual int GetDialogButtons() const OVERRIDE; virtual std::wstring GetDialogButtonLabel( - MessageBoxFlags::DialogButton button) const; - virtual std::wstring GetWindowTitle() const; + MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual std::wstring GetWindowTitle() const OVERRIDE; // views::WindowDelegate: - virtual void DeleteDelegate(); - virtual bool IsModal() const; - virtual views::View* GetContentsView(); + virtual void DeleteDelegate() OVERRIDE; + virtual bool IsModal() const OVERRIDE; + virtual views::View* GetContentsView() OVERRIDE; + virtual views::Widget* GetWidget() OVERRIDE; + virtual const views::Widget* GetWidget() const OVERRIDE; private: explicit RestartMessageBox(gfx::NativeWindow parent_window); diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h index 3f29582..cd1b844 100644 --- a/chrome/browser/ui/views/uninstall_view.h +++ b/chrome/browser/ui/views/uninstall_view.h @@ -19,9 +19,8 @@ class Label; // UninstallView implements the dialog that confirms Chrome uninstallation // and asks whether to delete Chrome profile. Also if currently Chrome is set // as default browser, it asks users whether to set another browser as default. -class UninstallView : public views::View, - public views::ButtonListener, - public views::DialogDelegate, +class UninstallView : public views::ButtonListener, + public views::DialogDelegateView, public ui::ComboboxModel { public: explicit UninstallView(int& user_selection); diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index 09ce309..7fd9a3c 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc @@ -84,6 +84,14 @@ views::View* UpdateRecommendedMessageBox::GetContentsView() { return message_box_view_; } +views::Widget* UpdateRecommendedMessageBox::GetWidget() { + return message_box_view_->GetWidget(); +} + +const views::Widget* UpdateRecommendedMessageBox::GetWidget() const { + return message_box_view_->GetWidget(); +} + //////////////////////////////////////////////////////////////////////////////// // UpdateRecommendedMessageBox, private: diff --git a/chrome/browser/ui/views/update_recommended_message_box.h b/chrome/browser/ui/views/update_recommended_message_box.h index cb8e646..468c8f5 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.h +++ b/chrome/browser/ui/views/update_recommended_message_box.h @@ -36,6 +36,8 @@ class UpdateRecommendedMessageBox : public views::DialogDelegate { virtual void DeleteDelegate() OVERRIDE; virtual bool IsModal() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; + virtual views::Widget* GetWidget() OVERRIDE; + virtual const views::Widget* GetWidget() const OVERRIDE; private: explicit UpdateRecommendedMessageBox(gfx::NativeWindow parent_window); diff --git a/chrome/browser/ui/views/user_data_dir_dialog.cc b/chrome/browser/ui/views/user_data_dir_dialog.cc index 26235fd..25c0cea 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog.cc +++ b/chrome/browser/ui/views/user_data_dir_dialog.cc @@ -87,6 +87,14 @@ views::View* UserDataDirDialog::GetContentsView() { return message_box_view_; } +views::Widget* UserDataDirDialog::GetWidget() { + return message_box_view_->GetWidget(); +} + +const views::Widget* UserDataDirDialog::GetWidget() const { + return message_box_view_->GetWidget(); +} + bool UserDataDirDialog::Dispatch(const MSG& msg) { TranslateMessage(&msg); DispatchMessage(&msg); diff --git a/chrome/browser/ui/views/user_data_dir_dialog.h b/chrome/browser/ui/views/user_data_dir_dialog.h index fa51df1..8ae253a 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog.h +++ b/chrome/browser/ui/views/user_data_dir_dialog.h @@ -35,23 +35,26 @@ class UserDataDirDialog : public views::DialogDelegate, // views::DialogDelegate Methods: virtual std::wstring GetDialogButtonLabel( - MessageBoxFlags::DialogButton button) const; - virtual std::wstring GetWindowTitle() const; - virtual void DeleteDelegate(); - virtual bool Accept(); - virtual bool Cancel(); + MessageBoxFlags::DialogButton button) const OVERRIDE; + virtual std::wstring GetWindowTitle() const OVERRIDE; + virtual void DeleteDelegate() OVERRIDE; + virtual bool Accept() OVERRIDE; + virtual bool Cancel() OVERRIDE; // views::WindowDelegate Methods: - virtual bool IsAlwaysOnTop() const { return false; } - virtual bool IsModal() const { return false; } - virtual views::View* GetContentsView(); + virtual bool IsModal() const OVERRIDE { return false; } + virtual views::View* GetContentsView() OVERRIDE; + virtual views::Widget* GetWidget() OVERRIDE; + virtual const views::Widget* GetWidget() const OVERRIDE; // MessageLoop::Dispatcher Method: - virtual bool Dispatch(const MSG& msg); + virtual bool Dispatch(const MSG& msg) OVERRIDE; // SelectFileDialog::Listener Methods: - virtual void FileSelected(const FilePath& path, int index, void* params); - virtual void FileSelectionCanceled(void* params); + virtual void FileSelected(const FilePath& path, + int index, + void* params) OVERRIDE; + virtual void FileSelectionCanceled(void* params) OVERRIDE; private: explicit UserDataDirDialog(const FilePath& user_data_dir); |