summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
Diffstat (limited to 'ash')
-rw-r--r--ash/launcher/launcher_button.cc4
-rw-r--r--ash/shelf/shelf_widget.cc6
-rw-r--r--ash/shell/app_list.cc8
-rw-r--r--ash/wm/partial_screenshot_view_unittest.cc8
4 files changed, 13 insertions, 13 deletions
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index dad5d18..78fc815 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -96,7 +96,7 @@ class LauncherButtonAnimation : public ui::AnimationDelegate {
}
// ui::AnimationDelegate
- void AnimationProgressed(const ui::Animation* animation) {
+ virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE {
if (animation != &animation_)
return;
if (!animation_.is_animating())
@@ -126,7 +126,7 @@ class LauncherButton::BarView : public views::ImageView,
show_attention_(false) {
}
- ~BarView() {
+ virtual ~BarView() {
if (show_attention_)
LauncherButtonAnimation::GetInstance()->RemoveObserver(this);
}
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index f847a5e..eab771be1ad 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -71,13 +71,13 @@ class DimmerView : public views::View,
}
// ash::internal::BackgroundAnimatorDelegate overrides:
- virtual void UpdateBackground(int alpha) {
+ virtual void UpdateBackground(int alpha) OVERRIDE {
alpha_ = alpha;
SchedulePaint();
}
// views::View overrides:
- void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
+ virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
// A function to test the current alpha used.
int get_dimming_alpha_for_test() { return alpha_; }
@@ -87,7 +87,7 @@ class DimmerView : public views::View,
class DimmerEventFilter : public ui::EventHandler {
public:
explicit DimmerEventFilter(DimmerView* owner);
- ~DimmerEventFilter();
+ virtual ~DimmerEventFilter();
// Overridden from ui::EventHandler:
virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index 9afee4f..7ee4d38 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -295,19 +295,19 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
return gfx::ImageSkia();
}
- virtual base::string16 GetCurrentUserName() {
+ virtual base::string16 GetCurrentUserName() OVERRIDE {
return base::string16();
}
- virtual base::string16 GetCurrentUserEmail() {
+ virtual base::string16 GetCurrentUserEmail() OVERRIDE {
return base::string16();
}
- virtual void OpenSettings() {
+ virtual void OpenSettings() OVERRIDE {
// Nothing needs to be done.
}
- virtual void OpenFeedback() {
+ virtual void OpenFeedback() OVERRIDE {
// Nothing needs to be done.
}
diff --git a/ash/wm/partial_screenshot_view_unittest.cc b/ash/wm/partial_screenshot_view_unittest.cc
index ea1d54c..a763577 100644
--- a/ash/wm/partial_screenshot_view_unittest.cc
+++ b/ash/wm/partial_screenshot_view_unittest.cc
@@ -17,14 +17,14 @@ class FakeScreenshotDelegate : public ScreenshotDelegate {
public:
FakeScreenshotDelegate() : screenshot_count_(0) {}
- void HandleTakeScreenshotForAllRootWindows() OVERRIDE {}
- void HandleTakePartialScreenshot(aura::Window* window,
- const gfx::Rect& rect) OVERRIDE {
+ virtual void HandleTakeScreenshotForAllRootWindows() OVERRIDE {}
+ virtual void HandleTakePartialScreenshot(aura::Window* window,
+ const gfx::Rect& rect) OVERRIDE {
rect_ = rect;
screenshot_count_++;
}
- bool CanTakeScreenshot() OVERRIDE {
+ virtual bool CanTakeScreenshot() OVERRIDE {
return true;
}