Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Unified Diff: chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
diff --git a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
index 8d322dc3328431020e2cdddcacccc39ec8d29188..2d3419fc48f3a488c02ef7f8127908ca96db85f9 100644
--- a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
+++ b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
@@ -25,27 +25,27 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
virtual ~UserWallpaperDelegate() {
}
- virtual int GetAnimationType() OVERRIDE {
+ virtual int GetAnimationType() override {
return ShouldShowInitialAnimation() ?
ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE :
static_cast<int>(wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
}
- virtual bool ShouldShowInitialAnimation() OVERRIDE {
+ virtual bool ShouldShowInitialAnimation() override {
return true;
}
- virtual int GetAnimationDurationOverride() OVERRIDE {
+ virtual int GetAnimationDurationOverride() override {
// Return 0 to select the default.
return 0;
}
virtual void SetAnimationDurationOverride(
- int animation_duration_in_ms) OVERRIDE {
+ int animation_duration_in_ms) override {
NOTIMPLEMENTED();
}
- virtual void UpdateWallpaper(bool clear_cache) OVERRIDE {
+ virtual void UpdateWallpaper(bool clear_cache) override {
SkBitmap bitmap;
bitmap.allocN32Pixels(16, 16);
bitmap.eraseARGB(255, kBackgroundRed, kBackgroundGreen, kBackgroundBlue);
@@ -63,21 +63,21 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
->SetWallpaperImage(wallpaper, ash::WALLPAPER_LAYOUT_TILE);
}
- virtual void InitializeWallpaper() OVERRIDE {
+ virtual void InitializeWallpaper() override {
UpdateWallpaper(false);
}
- virtual void OpenSetWallpaperPage() OVERRIDE {
+ virtual void OpenSetWallpaperPage() override {
}
- virtual bool CanOpenSetWallpaperPage() OVERRIDE {
+ virtual bool CanOpenSetWallpaperPage() override {
return false;
}
- virtual void OnWallpaperAnimationFinished() OVERRIDE {
+ virtual void OnWallpaperAnimationFinished() override {
}
- virtual void OnWallpaperBootAnimationFinished() OVERRIDE {
+ virtual void OnWallpaperBootAnimationFinished() override {
}
private:
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_views.h ('k') | chrome/browser/ui/ash/stub_user_accounts_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698