diff options
-rw-r--r-- | chrome/browser/automation/automation_provider_observers.h | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/frame/panel_browser_view.h | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/client_login_response_handler.h | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/sim_dialog_delegate.h | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/keyboard_overlay_delegate.h | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/notifications/balloon_view_host.cc | 4 | ||||
-rw-r--r-- | chrome/browser/ui/views/notifications/balloon_view_host.h | 4 | ||||
-rw-r--r-- | chrome/browser/ui/views/profile_tag_view.h | 3 | ||||
-rw-r--r-- | chrome/browser/ui/views/status_bubble_views.h | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/wrench_menu.h | 2 | ||||
-rw-r--r-- | chrome/browser/ui/webui/mediaplayer_ui.h | 2 | ||||
-rw-r--r-- | views/animation/bounds_animator.h | 2 | ||||
-rw-r--r-- | views/controls/menu/submenu_view.h | 2 | ||||
-rw-r--r-- | views/controls/textfield/native_textfield_views.h | 2 |
14 files changed, 17 insertions, 16 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h index e8e1c76..ed4e9d2 100644 --- a/chrome/browser/automation/automation_provider_observers.h +++ b/chrome/browser/automation/automation_provider_observers.h @@ -729,7 +729,7 @@ class LoginObserver : public chromeos::LoginStatusConsumer, AutomationProvider* automation, IPC::Message* reply_message); - ~LoginObserver(); + virtual ~LoginObserver(); virtual void OnLoginFailure(const chromeos::LoginFailure& error); diff --git a/chrome/browser/chromeos/frame/panel_browser_view.h b/chrome/browser/chromeos/frame/panel_browser_view.h index 1a4c7e4..b31d022 100644 --- a/chrome/browser/chromeos/frame/panel_browser_view.h +++ b/chrome/browser/chromeos/frame/panel_browser_view.h @@ -24,7 +24,7 @@ class PanelBrowserView : public ::BrowserView, public PanelController::Delegate { public: explicit PanelBrowserView(Browser* browser); - ~PanelBrowserView(); + virtual ~PanelBrowserView(); // BrowserView overrides. virtual void Show(); diff --git a/chrome/browser/chromeos/login/client_login_response_handler.h b/chrome/browser/chromeos/login/client_login_response_handler.h index d0096b0..5ea0045 100644 --- a/chrome/browser/chromeos/login/client_login_response_handler.h +++ b/chrome/browser/chromeos/login/client_login_response_handler.h @@ -25,7 +25,7 @@ class ClientLoginResponseHandler : public AuthResponseHandler { public: explicit ClientLoginResponseHandler(net::URLRequestContextGetter* getter) : getter_(getter) {} - ~ClientLoginResponseHandler() {} + virtual ~ClientLoginResponseHandler() {} // Overridden from AuthResponseHandler. virtual bool CanHandle(const GURL& url); diff --git a/chrome/browser/chromeos/sim_dialog_delegate.h b/chrome/browser/chromeos/sim_dialog_delegate.h index adca364..fe68b20 100644 --- a/chrome/browser/chromeos/sim_dialog_delegate.h +++ b/chrome/browser/chromeos/sim_dialog_delegate.h @@ -27,7 +27,7 @@ class SimDialogDelegate : public HtmlDialogUIDelegate { static void ShowDialog(gfx::NativeWindow owning_window, SimDialogMode mode); private: - ~SimDialogDelegate(); + virtual ~SimDialogDelegate(); // Overridden from HtmlDialogUI::Delegate: virtual bool IsDialogModal() const; diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.h b/chrome/browser/ui/views/keyboard_overlay_delegate.h index fed676e..e464176 100644 --- a/chrome/browser/ui/views/keyboard_overlay_delegate.h +++ b/chrome/browser/ui/views/keyboard_overlay_delegate.h @@ -23,7 +23,7 @@ class KeyboardOverlayDelegate : public HtmlDialogUIDelegate { } private: - ~KeyboardOverlayDelegate(); + virtual ~KeyboardOverlayDelegate(); // Overridden from HtmlDialogUI::Delegate: virtual bool IsDialogModal() const; diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.cc b/chrome/browser/ui/views/notifications/balloon_view_host.cc index fc01900..aef58df 100644 --- a/chrome/browser/ui/views/notifications/balloon_view_host.cc +++ b/chrome/browser/ui/views/notifications/balloon_view_host.cc @@ -48,6 +48,10 @@ BalloonViewHost::BalloonViewHost(Balloon* balloon) native_host_ = new BalloonViewHostView(this); } +BalloonViewHost::~BalloonViewHost() { + Shutdown(); +} + void BalloonViewHost::Init(gfx::NativeView parent_native_view) { parent_native_view_ = parent_native_view; BalloonHost::Init(); diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.h b/chrome/browser/ui/views/notifications/balloon_view_host.h index 23f82b9..e3b0a23 100644 --- a/chrome/browser/ui/views/notifications/balloon_view_host.h +++ b/chrome/browser/ui/views/notifications/balloon_view_host.h @@ -17,9 +17,7 @@ class BalloonViewHost : public BalloonHost { public: explicit BalloonViewHost(Balloon* balloon); - virtual ~BalloonViewHost() { - Shutdown(); - } + virtual ~BalloonViewHost(); void SetPreferredSize(const gfx::Size& size) { native_host_->SetPreferredSize(size); diff --git a/chrome/browser/ui/views/profile_tag_view.h b/chrome/browser/ui/views/profile_tag_view.h index 288810b..017c775 100644 --- a/chrome/browser/ui/views/profile_tag_view.h +++ b/chrome/browser/ui/views/profile_tag_view.h @@ -27,7 +27,7 @@ class ProfileTagView : public views::View { ProfileTagView(BrowserFrame* frame, ProfileMenuButton* profile_menu_button); - ~ProfileTagView(); + virtual ~ProfileTagView(); // Paint the profile tag background image on the given canvas. virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; @@ -66,4 +66,3 @@ class ProfileTagView : public views::View { }; #endif // CHROME_BROWSER_UI_VIEWS_PROFILE_TAG_VIEW_H_ - diff --git a/chrome/browser/ui/views/status_bubble_views.h b/chrome/browser/ui/views/status_bubble_views.h index e0d1327..9779296 100644 --- a/chrome/browser/ui/views/status_bubble_views.h +++ b/chrome/browser/ui/views/status_bubble_views.h @@ -36,7 +36,7 @@ class StatusBubbleViews : public StatusBubble { // |base_view| is the view that this bubble is positioned relative to. explicit StatusBubbleViews(views::View* base_view); - ~StatusBubbleViews(); + virtual ~StatusBubbleViews(); views::View* base_view() { return base_view_; } diff --git a/chrome/browser/ui/views/wrench_menu.h b/chrome/browser/ui/views/wrench_menu.h index 08b2f8c..76c9885 100644 --- a/chrome/browser/ui/views/wrench_menu.h +++ b/chrome/browser/ui/views/wrench_menu.h @@ -80,7 +80,7 @@ class WrenchMenu : public base::RefCounted<WrenchMenu>, typedef std::pair<ui::MenuModel*,int> Entry; typedef std::map<int,Entry> IDToEntry; - ~WrenchMenu(); + virtual ~WrenchMenu(); // Populates |parent| with all the child menus in |model|. Recursively invokes // |PopulateMenu| for any submenu. |next_id| is incremented for every menu diff --git a/chrome/browser/ui/webui/mediaplayer_ui.h b/chrome/browser/ui/webui/mediaplayer_ui.h index ddf9f9a..7e25ba5 100644 --- a/chrome/browser/ui/webui/mediaplayer_ui.h +++ b/chrome/browser/ui/webui/mediaplayer_ui.h @@ -28,7 +28,7 @@ class Profile; class MediaPlayer : public NotificationObserver, public net::URLRequest::Interceptor { public: - ~MediaPlayer(); + virtual ~MediaPlayer(); // Enqueues this file into the current playlist. If the mediaplayer is // not currently visible, show it, and play the given url. diff --git a/views/animation/bounds_animator.h b/views/animation/bounds_animator.h index 940f289..6785e43 100644 --- a/views/animation/bounds_animator.h +++ b/views/animation/bounds_animator.h @@ -49,7 +49,7 @@ class BoundsAnimator : public ui::AnimationDelegate, }; explicit BoundsAnimator(View* view); - ~BoundsAnimator(); + virtual ~BoundsAnimator(); // Starts animating |view| from its current bounds to |target|. If there is // already an animation running for the view it's stopped and a new one diff --git a/views/controls/menu/submenu_view.h b/views/controls/menu/submenu_view.h index 54dc6c3..0caeffc 100644 --- a/views/controls/menu/submenu_view.h +++ b/views/controls/menu/submenu_view.h @@ -39,7 +39,7 @@ class SubmenuView : public View { // Creates a SubmenuView for the specified menu item. explicit SubmenuView(MenuItemView* parent); - ~SubmenuView(); + virtual ~SubmenuView(); // Returns the number of child views that are MenuItemViews. // MenuItemViews are identified by ID. diff --git a/views/controls/textfield/native_textfield_views.h b/views/controls/textfield/native_textfield_views.h index 8889e26..512657c 100644 --- a/views/controls/textfield/native_textfield_views.h +++ b/views/controls/textfield/native_textfield_views.h @@ -47,7 +47,7 @@ class NativeTextfieldViews : public View, public TextfieldViewsModel::Delegate { public: explicit NativeTextfieldViews(Textfield* parent); - ~NativeTextfieldViews(); + virtual ~NativeTextfieldViews(); // View overrides: virtual gfx::NativeCursor GetCursor(const MouseEvent& event) OVERRIDE; |