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

Unified Diff: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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/chromeos/background/ash_user_wallpaper_delegate.cc
diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
index 4dc45846461e77c82730385114f0d80921b990fb..b551e7cf3ffe83b6a97bb88904beb73c6d331eca 100644
--- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
+++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
@@ -46,22 +46,22 @@ 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 int GetAnimationDurationOverride() OVERRIDE {
+ virtual int GetAnimationDurationOverride() override {
return animation_duration_override_in_ms_;
}
virtual void SetAnimationDurationOverride(
- int animation_duration_in_ms) OVERRIDE {
+ int animation_duration_in_ms) override {
animation_duration_override_in_ms_ = animation_duration_in_ms;
}
- virtual bool ShouldShowInitialAnimation() OVERRIDE {
+ virtual bool ShouldShowInitialAnimation() override {
if (IsNormalWallpaperChange() || boot_animation_finished_)
return false;
@@ -77,20 +77,20 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
return true;
}
- virtual void UpdateWallpaper(bool clear_cache) OVERRIDE {
+ virtual void UpdateWallpaper(bool clear_cache) override {
chromeos::WallpaperManager::Get()->UpdateWallpaper(clear_cache);
}
- virtual void InitializeWallpaper() OVERRIDE {
+ virtual void InitializeWallpaper() override {
chromeos::WallpaperManager::Get()->InitializeWallpaper();
}
- virtual void OpenSetWallpaperPage() OVERRIDE {
+ virtual void OpenSetWallpaperPage() override {
if (CanOpenSetWallpaperPage())
wallpaper_manager_util::OpenWallpaperManager();
}
- virtual bool CanOpenSetWallpaperPage() OVERRIDE {
+ virtual bool CanOpenSetWallpaperPage() override {
const LoginState* login_state = LoginState::Get();
const LoginState::LoggedInUserType user_type =
login_state->GetLoggedInUserType();
@@ -114,14 +114,14 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
return true;
}
- virtual void OnWallpaperAnimationFinished() OVERRIDE {
+ virtual void OnWallpaperAnimationFinished() override {
content::NotificationService::current()->Notify(
chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
content::NotificationService::AllSources(),
content::NotificationService::NoDetails());
}
- virtual void OnWallpaperBootAnimationFinished() OVERRIDE {
+ virtual void OnWallpaperBootAnimationFinished() override {
// Make sure that boot animation type is used only once.
boot_animation_finished_ = true;
}

Powered by Google App Engine
This is Rietveld 408576698