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

Side by Side Diff: ash/wallpaper/wallpaper_controller.h

Issue 2848883004: Add screen rotation animator lock. (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « ash/rotator/screen_rotation_animator_lock.cc ('k') | ash/wallpaper/wallpaper_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_ 5 #ifndef ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
6 #define ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_ 6 #define ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 15 matching lines...) Expand all
26 class TaskRunner; 26 class TaskRunner;
27 } 27 }
28 28
29 namespace wallpaper { 29 namespace wallpaper {
30 class WallpaperColorCalculator; 30 class WallpaperColorCalculator;
31 class WallpaperResizer; 31 class WallpaperResizer;
32 } 32 }
33 33
34 namespace ash { 34 namespace ash {
35 35
36 class ScreenRotationAnimatorLock;
36 class WallpaperControllerObserver; 37 class WallpaperControllerObserver;
37 38
38 // Controls the desktop background wallpaper: 39 // Controls the desktop background wallpaper:
39 // - Sets a wallpaper image and layout; 40 // - Sets a wallpaper image and layout;
40 // - Handles display change (add/remove display, configuration change etc); 41 // - Handles display change (add/remove display, configuration change etc);
41 // - Calculates prominent color for shelf; 42 // - Calculates prominent color for shelf;
42 // - Move wallpaper to locked container(s) when session state is not ACTIVE to 43 // - Move wallpaper to locked container(s) when session state is not ACTIVE to
43 // hide the user desktop and move it to unlocked container when session 44 // hide the user desktop and move it to unlocked container when session
44 // state is ACTIVE; 45 // state is ACTIVE;
45 class ASH_EXPORT WallpaperController 46 class ASH_EXPORT WallpaperController
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 bool compare_layouts, 111 bool compare_layouts,
111 wallpaper::WallpaperLayout layout) const; 112 wallpaper::WallpaperLayout layout) const;
112 113
113 void set_wallpaper_reload_delay_for_test(int value) { 114 void set_wallpaper_reload_delay_for_test(int value) {
114 wallpaper_reload_delay_ = value; 115 wallpaper_reload_delay_ = value;
115 } 116 }
116 117
117 // Opens the set wallpaper page in the browser. 118 // Opens the set wallpaper page in the browser.
118 void OpenSetWallpaperPage(); 119 void OpenSetWallpaperPage();
119 120
121 // ScreenRotationAnimatorLock controllered by the ScreenRotationAnimator.
122 void SetScreenRotationAnimatorLock(ScreenRotationAnimatorLock* lock) {
123 screen_rotation_animator_lock_ = lock;
124 }
125
120 // mojom::WallpaperController overrides: 126 // mojom::WallpaperController overrides:
121 void SetWallpaperPicker(mojom::WallpaperPickerPtr picker) override; 127 void SetWallpaperPicker(mojom::WallpaperPickerPtr picker) override;
122 void SetWallpaper(const SkBitmap& wallpaper, 128 void SetWallpaper(const SkBitmap& wallpaper,
123 wallpaper::WallpaperLayout layout) override; 129 wallpaper::WallpaperLayout layout) override;
124 130
125 // WallpaperResizerObserver: 131 // WallpaperResizerObserver:
126 void OnWallpaperResized() override; 132 void OnWallpaperResized() override;
127 133
128 // WallpaperColorCalculatorObserver: 134 // WallpaperColorCalculatorObserver:
129 void OnColorCalculationComplete() override; 135 void OnColorCalculationComplete() override;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 gfx::Size current_max_display_size_; 203 gfx::Size current_max_display_size_;
198 204
199 base::OneShotTimer timer_; 205 base::OneShotTimer timer_;
200 206
201 int wallpaper_reload_delay_; 207 int wallpaper_reload_delay_;
202 208
203 scoped_refptr<base::TaskRunner> task_runner_; 209 scoped_refptr<base::TaskRunner> task_runner_;
204 210
205 ScopedSessionObserver scoped_session_observer_; 211 ScopedSessionObserver scoped_session_observer_;
206 212
213 // weak ptr.
214 ScreenRotationAnimatorLock* screen_rotation_animator_lock_;
215
207 DISALLOW_COPY_AND_ASSIGN(WallpaperController); 216 DISALLOW_COPY_AND_ASSIGN(WallpaperController);
208 }; 217 };
209 218
210 } // namespace ash 219 } // namespace ash
211 220
212 #endif // ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_ 221 #endif // ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/rotator/screen_rotation_animator_lock.cc ('k') | ash/wallpaper/wallpaper_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698