diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 00:27:55 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 00:27:55 +0000 |
| commit | cd221353926b9155feb6a32dad7a61cdfd0908eb (patch) | |
| tree | 5ab079fbc7f1491d1b649cb0e0d9dab28c080105 /ash | |
| parent | fa8cfb0369dc6f6b7470d1163773709d876b0845 (diff) | |
| download | chromium_src-cd221353926b9155feb6a32dad7a61cdfd0908eb.zip chromium_src-cd221353926b9155feb6a32dad7a61cdfd0908eb.tar.gz chromium_src-cd221353926b9155feb6a32dad7a61cdfd0908eb.tar.bz2 | |
Aura compile issues under clang
Fixes misc clang/style errors for Aura sources. This should be the last
of them.
BUG=109946
TEST=Compiles under mac/clang.
R=sky@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=117499
Review URL: http://codereview.chromium.org/9197005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/launcher/launcher.h | 2 | ||||
| -rw-r--r-- | ash/tooltips/tooltip_controller.h | 4 | ||||
| -rw-r--r-- | ash/wm/power_button_controller.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h index 069b513..2b3539e 100644 --- a/ash/launcher/launcher.h +++ b/ash/launcher/launcher.h @@ -28,7 +28,7 @@ class LauncherModel; class ASH_EXPORT Launcher : public aura::WindowObserver { public: explicit Launcher(aura::Window* window_container); - ~Launcher(); + virtual ~Launcher(); // Sets the width of the status area. void SetStatusWidth(int width); diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h index 2d1eb34..2246ad5 100644 --- a/ash/tooltips/tooltip_controller.h +++ b/ash/tooltips/tooltip_controller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -39,7 +39,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient, virtual ~TooltipController(); // Overridden from aura::client::TooltipClient. - void UpdateTooltip(aura::Window* target); + virtual void UpdateTooltip(aura::Window* target) OVERRIDE; // Overridden from aura::EventFilter. virtual bool PreHandleKeyEvent(aura::Window* target, diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h index 8cb8704..a0e0bc5 100644 --- a/ash/wm/power_button_controller.h +++ b/ash/wm/power_button_controller.h @@ -125,7 +125,7 @@ class ASH_EXPORT PowerButtonController : public aura::RootWindowObserver { }; PowerButtonController(); - ~PowerButtonController(); + virtual ~PowerButtonController(); void set_delegate(PowerButtonControllerDelegate* delegate) { delegate_.reset(delegate); |