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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" 5 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
6 6
7 #include "ash/desktop_background/user_wallpaper_delegate.h" 7 #include "ash/desktop_background/user_wallpaper_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/wm/common/window_animation_types.h"
9 #include "ash/wm/window_animations.h" 10 #include "ash/wm/window_animations.h"
10 #include "base/command_line.h" 11 #include "base/command_line.h"
11 #include "base/logging.h" 12 #include "base/logging.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h" 15 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"
15 #include "chrome/browser/chromeos/login/startup_utils.h" 16 #include "chrome/browser/chromeos/login/startup_utils.h"
16 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 17 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
17 #include "chrome/browser/chromeos/login/wizard_controller.h" 18 #include "chrome/browser/chromeos/login/wizard_controller.h"
18 #include "chromeos/chromeos_switches.h" 19 #include "chromeos/chromeos_switches.h"
(...skipping 22 matching lines...) Expand all
41 class UserWallpaperDelegate : public ash::UserWallpaperDelegate { 42 class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
42 public: 43 public:
43 UserWallpaperDelegate() 44 UserWallpaperDelegate()
44 : boot_animation_finished_(false), 45 : boot_animation_finished_(false),
45 animation_duration_override_in_ms_(0) { 46 animation_duration_override_in_ms_(0) {
46 } 47 }
47 48
48 ~UserWallpaperDelegate() override {} 49 ~UserWallpaperDelegate() override {}
49 50
50 int GetAnimationType() override { 51 int GetAnimationType() override {
51 return ShouldShowInitialAnimation() ? 52 return ShouldShowInitialAnimation()
52 ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE : 53 ? ash::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE
53 static_cast<int>(wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); 54 : static_cast<int>(::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
54 } 55 }
55 56
56 int GetAnimationDurationOverride() override { 57 int GetAnimationDurationOverride() override {
57 return animation_duration_override_in_ms_; 58 return animation_duration_override_in_ms_;
58 } 59 }
59 60
60 void SetAnimationDurationOverride(int animation_duration_in_ms) override { 61 void SetAnimationDurationOverride(int animation_duration_in_ms) override {
61 animation_duration_override_in_ms_ = animation_duration_in_ms; 62 animation_duration_override_in_ms_ = animation_duration_in_ms;
62 } 63 }
63 64
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); 138 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate);
138 }; 139 };
139 140
140 } // namespace 141 } // namespace
141 142
142 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { 143 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {
143 return new chromeos::UserWallpaperDelegate(); 144 return new chromeos::UserWallpaperDelegate();
144 } 145 }
145 146
146 } // namespace chromeos 147 } // namespace chromeos
OLDNEW
« 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