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

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

Issue 1901773002: Removes most of aura dependencies from DefaultState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wm_window_positioner
Patch Set: nit and merge Created 4 years, 8 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
« no previous file with comments | « ash/wm/workspace_controller.cc ('k') | chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d91d717b293d759451285eb875d472df989b83a8..670ab59f0e1e9e50b43bd206180dd4072154df5b 100644
--- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
+++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
@@ -6,6 +6,7 @@
#include "ash/desktop_background/user_wallpaper_delegate.h"
#include "ash/shell.h"
+#include "ash/wm/common/window_animation_types.h"
#include "ash/wm/window_animations.h"
#include "base/command_line.h"
#include "base/logging.h"
@@ -48,9 +49,9 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
~UserWallpaperDelegate() override {}
int GetAnimationType() override {
- return ShouldShowInitialAnimation() ?
- ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE :
- static_cast<int>(wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
+ return ShouldShowInitialAnimation()
+ ? ash::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE
+ : static_cast<int>(::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
}
int GetAnimationDurationOverride() override {
« no previous file with comments | « ash/wm/workspace_controller.cc ('k') | chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698