diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 17:06:07 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 17:06:07 +0000 |
commit | 334b47007cdd108b8e0b0566bd29f952f5ad71f8 (patch) | |
tree | 64a6dfbe1472819ecce5d8bc80d1b52961307267 /chrome | |
parent | ed7ae462b7ac6341305f5861c876c7adf99160be (diff) | |
download | chromium_src-334b47007cdd108b8e0b0566bd29f952f5ad71f8.zip chromium_src-334b47007cdd108b8e0b0566bd29f952f5ad71f8.tar.gz chromium_src-334b47007cdd108b8e0b0566bd29f952f5ad71f8.tar.bz2 |
views: Fix views::WindowDelegate comments.
Ben has refactored the WindowDelegate and it doesn't exists anymore, it's now
WidgetDelegate, so fix the comments to refer to views::WidgetDelegate instead of
views::WindowDelegate.
R=sky@chromium.org
Review URL: http://codereview.chromium.org/7933014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
16 files changed, 30 insertions, 30 deletions
diff --git a/chrome/browser/chromeos/login/password_changed_view.h b/chrome/browser/chromeos/login/password_changed_view.h index 71ae91a..c0bff39 100644 --- a/chrome/browser/chromeos/login/password_changed_view.h +++ b/chrome/browser/chromeos/login/password_changed_view.h @@ -48,7 +48,7 @@ class PasswordChangedView : public views::DialogDelegateView, virtual bool Accept(); virtual int GetDialogButtons() const; - // views::WindowDelegate: + // views::WidgetDelegate: virtual View* GetInitiallyFocusedView(); virtual bool IsModal() const; virtual views::View* GetContentsView(); diff --git a/chrome/browser/chromeos/options/take_photo_dialog.h b/chrome/browser/chromeos/options/take_photo_dialog.h index 191783c..e627166 100644 --- a/chrome/browser/chromeos/options/take_photo_dialog.h +++ b/chrome/browser/chromeos/options/take_photo_dialog.h @@ -37,13 +37,13 @@ class TakePhotoDialog : public views::DialogDelegateView, explicit TakePhotoDialog(Delegate* delegate); virtual ~TakePhotoDialog(); - // views::DialogDelegate overrides. + // views::DialogDelegateView overrides. virtual bool IsDialogButtonEnabled( MessageBoxFlags::DialogButton button) const; virtual bool Cancel(); virtual bool Accept(); - // views::WindowDelegate overrides. + // views::WidgetDelegate overrides. virtual bool IsModal() const; virtual views::View* GetContentsView(); diff --git a/chrome/browser/ui/views/about_ipc_dialog.h b/chrome/browser/ui/views/about_ipc_dialog.h index 482df2e..f405e52 100644 --- a/chrome/browser/ui/views/about_ipc_dialog.h +++ b/chrome/browser/ui/views/about_ipc_dialog.h @@ -54,7 +54,7 @@ class AboutIPCDialog : public views::DialogDelegateView, // IPC::Logging::Consumer implementation. virtual void Log(const IPC::LogData& data); - // views::WindowDelegate (via view::DialogDelegate). + // views::WidgetDelegate (via views::DialogDelegateView). virtual bool CanResize() const; // views::ButtonListener. 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 0ede578..58b4551 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -70,14 +70,14 @@ class ExtensionInstallDialogView : public views::DialogDelegateView, virtual ~ExtensionInstallDialogView(); private: - // views::DialogDelegate: + // views::DialogDelegateView: virtual std::wstring GetDialogButtonLabel( MessageBoxFlags::DialogButton button) const OVERRIDE; virtual int GetDefaultDialogButton() const OVERRIDE; virtual bool Cancel() OVERRIDE; virtual bool Accept() OVERRIDE; - // views::WindowDelegate: + // views::WidgetDelegate: virtual bool IsModal() const OVERRIDE; virtual std::wstring GetWindowTitle() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; 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 5f21487..343ee5b 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -51,7 +51,7 @@ class ExtensionUninstallDialogView : public views::DialogDelegateView { } private: - // views::DialogDelegate: + // views::DialogDelegateView: virtual std::wstring GetDialogButtonLabel( MessageBoxFlags::DialogButton button) const OVERRIDE { switch (button) { @@ -81,7 +81,7 @@ class ExtensionUninstallDialogView : public views::DialogDelegateView { return true; } - // views::WindowDelegate: + // views::WidgetDelegate: virtual bool IsModal() const OVERRIDE { return true; } virtual std::wstring GetWindowTitle() const OVERRIDE { return UTF16ToWide( diff --git a/chrome/browser/ui/views/external_protocol_dialog.h b/chrome/browser/ui/views/external_protocol_dialog.h index f4d4eef..857ce3f 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.h +++ b/chrome/browser/ui/views/external_protocol_dialog.h @@ -29,7 +29,7 @@ class ExternalProtocolDialog : public views::DialogDelegate { virtual ~ExternalProtocolDialog(); - // views::DialogDelegate Methods: + // views::DialogDelegate methods: virtual int GetDefaultDialogButton() const OVERRIDE; virtual std::wstring GetDialogButtonLabel( MessageBoxFlags::DialogButton button) const OVERRIDE; @@ -41,7 +41,7 @@ class ExternalProtocolDialog : public views::DialogDelegate { virtual views::Widget* GetWidget() OVERRIDE; virtual const views::Widget* GetWidget() const OVERRIDE; - // views::WindowDelegate Methods: + // views::WidgetDelegate methods: virtual bool IsAlwaysOnTop() const { return false; } virtual bool IsModal() const { return false; } diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 767da8e..6c99897 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -1572,7 +1572,7 @@ void BrowserView::ExecuteCommand(int command_id) { } /////////////////////////////////////////////////////////////////////////////// -// BrowserView, views::WindowDelegate implementation: +// BrowserView, views::WidgetDelegate implementation: bool BrowserView::CanResize() const { return true; diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index 1c1c75f..b4a50a8 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -10,8 +10,8 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/views/window.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/native_web_keyboard_event.h" #include "content/common/content_notification_types.h" +#include "content/common/native_web_keyboard_event.h" #include "content/common/notification_details.h" #include "content/common/notification_source.h" #include "ui/base/keycodes/keyboard_codes.h" @@ -86,7 +86,7 @@ void HtmlDialogView::ViewHierarchyChanged( } //////////////////////////////////////////////////////////////////////////////// -// HtmlDialogView, views::WindowDelegate implementation: +// HtmlDialogView, views::WidgetDelegate implementation: bool HtmlDialogView::CanResize() const { return true; diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index a6eee7a..f7f9aa8 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -234,7 +234,7 @@ class HungRendererDialogView : public views::DialogDelegateView, void ShowForTabContents(TabContents* contents); void EndForTabContents(TabContents* contents); - // views::WindowDelegate overrides: + // views::DialogDelegateView overrides: virtual std::wstring GetWindowTitle() const OVERRIDE; virtual void WindowClosing() OVERRIDE; virtual int GetDialogButtons() const OVERRIDE; diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index 1ee13f0..62fbc39 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -141,7 +141,7 @@ std::wstring JSModalDialogViews::GetDialogButtonLabel( } /////////////////////////////////////////////////////////////////////////////// -// JSModalDialogViews, views::WindowDelegate implementation: +// JSModalDialogViews, views::WidgetDelegate implementation: bool JSModalDialogViews::IsModal() const { return true; diff --git a/chrome/browser/ui/views/js_modal_dialog_views.h b/chrome/browser/ui/views/js_modal_dialog_views.h index abb2b60..9cc3733 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.h +++ b/chrome/browser/ui/views/js_modal_dialog_views.h @@ -43,7 +43,7 @@ class JSModalDialogViews : public NativeAppModalDialog, virtual std::wstring GetDialogButtonLabel( ui::MessageBoxFlags::DialogButton button) const OVERRIDE; - // Overridden from views::WindowDelegate: + // Overridden from views::WidgetDelegate: virtual bool IsModal() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; virtual views::View* GetInitiallyFocusedView() OVERRIDE; diff --git a/chrome/browser/ui/views/restart_message_box.h b/chrome/browser/ui/views/restart_message_box.h index c2f776d..510f778 100644 --- a/chrome/browser/ui/views/restart_message_box.h +++ b/chrome/browser/ui/views/restart_message_box.h @@ -28,7 +28,7 @@ class RestartMessageBox : public views::DialogDelegate { MessageBoxFlags::DialogButton button) const OVERRIDE; virtual std::wstring GetWindowTitle() const OVERRIDE; - // views::WindowDelegate: + // views::WidgetDelegate: virtual void DeleteDelegate() OVERRIDE; virtual bool IsModal() const OVERRIDE; virtual views::View* GetContentsView() OVERRIDE; diff --git a/chrome/browser/ui/views/simple_message_box_views.h b/chrome/browser/ui/views/simple_message_box_views.h index da66142..af7f949 100644 --- a/chrome/browser/ui/views/simple_message_box_views.h +++ b/chrome/browser/ui/views/simple_message_box_views.h @@ -53,7 +53,7 @@ class SimpleMessageBoxViews : public views::DialogDelegate, virtual std::wstring GetDialogButtonLabel( MessageBoxFlags::DialogButton button) const OVERRIDE; - // Overridden from views::WindowDelegate: + // Overridden from views::WidgetDelegate: virtual bool ShouldShowWindowTitle() const OVERRIDE; virtual std::wstring GetWindowTitle() const OVERRIDE; virtual void DeleteDelegate() OVERRIDE; diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h index cd1b844..39821de 100644 --- a/chrome/browser/ui/views/uninstall_view.h +++ b/chrome/browser/ui/views/uninstall_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -26,20 +26,20 @@ class UninstallView : public views::ButtonListener, explicit UninstallView(int& user_selection); virtual ~UninstallView(); - // Overridden from views::DialogDelegate: + // Overridden form views::ButtonListener. + virtual void ButtonPressed(views::Button* sender, const views::Event& event); + + // Overridden from views::DialogDelegateView: virtual bool Accept(); virtual bool Cancel(); virtual std::wstring GetDialogButtonLabel( MessageBoxFlags::DialogButton button) const; - // Overridden form views::ButtonListener. - virtual void ButtonPressed(views::Button* sender, const views::Event& event); - - // Overridden from views::WindowDelegate: + // Overridden from views::WidgetDelegate: virtual std::wstring GetWindowTitle() const; virtual views::View* GetContentsView(); - // Overridden from ui::ComboboxModel. + // Overridden from ui::ComboboxModel: virtual int GetItemCount(); virtual string16 GetItemAt(int index); diff --git a/chrome/browser/ui/views/update_recommended_message_box.h b/chrome/browser/ui/views/update_recommended_message_box.h index 468c8f5..72a045d 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.h +++ b/chrome/browser/ui/views/update_recommended_message_box.h @@ -30,7 +30,7 @@ class UpdateRecommendedMessageBox : public views::DialogDelegate { virtual std::wstring GetDialogButtonLabel( MessageBoxFlags::DialogButton button) const OVERRIDE; - // Overridden from views::WindowDelegate: + // Overridden from views::WidgetDelegate: virtual bool ShouldShowWindowTitle() const OVERRIDE; virtual std::wstring GetWindowTitle() const OVERRIDE; virtual void DeleteDelegate() OVERRIDE; diff --git a/chrome/browser/ui/views/user_data_dir_dialog.h b/chrome/browser/ui/views/user_data_dir_dialog.h index 8ae253a..f351aa0 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog.h +++ b/chrome/browser/ui/views/user_data_dir_dialog.h @@ -33,7 +33,7 @@ class UserDataDirDialog : public views::DialogDelegate, FilePath user_data_dir() const { return user_data_dir_; } - // views::DialogDelegate Methods: + // views::DialogDelegate methods: virtual std::wstring GetDialogButtonLabel( MessageBoxFlags::DialogButton button) const OVERRIDE; virtual std::wstring GetWindowTitle() const OVERRIDE; @@ -41,16 +41,16 @@ class UserDataDirDialog : public views::DialogDelegate, virtual bool Accept() OVERRIDE; virtual bool Cancel() OVERRIDE; - // views::WindowDelegate Methods: + // views::WidgetDelegate methods: 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: + // MessageLoop::Dispatcher method: virtual bool Dispatch(const MSG& msg) OVERRIDE; - // SelectFileDialog::Listener Methods: + // SelectFileDialog::Listener methods: virtual void FileSelected(const FilePath& path, int index, void* params) OVERRIDE; |