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

Side by Side Diff: ash/shell.h

Issue 9764012: Restore to user selected wallpaper after browser crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
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_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 class AcceleratorController; 44 class AcceleratorController;
45 class DesktopBackgroundController; 45 class DesktopBackgroundController;
46 class Launcher; 46 class Launcher;
47 class NestedDispatcherController; 47 class NestedDispatcherController;
48 class PowerButtonController; 48 class PowerButtonController;
49 class ScreenAsh; 49 class ScreenAsh;
50 class ShellDelegate; 50 class ShellDelegate;
51 class ShellObserver; 51 class ShellObserver;
52 class SystemTrayDelegate; 52 class SystemTrayDelegate;
53 class SystemTray; 53 class SystemTray;
54 class UserWallpaperDelegate;
54 class VideoDetector; 55 class VideoDetector;
55 class WindowCycleController; 56 class WindowCycleController;
56 57
57 namespace internal { 58 namespace internal {
58 class ActivationController; 59 class ActivationController;
59 class AcceleratorFilter; 60 class AcceleratorFilter;
60 class AppList; 61 class AppList;
61 class DragDropController; 62 class DragDropController;
62 class FocusCycler; 63 class FocusCycler;
63 class InputMethodEventFilter; 64 class InputMethodEventFilter;
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 } 184 }
184 WindowCycleController* window_cycle_controller() { 185 WindowCycleController* window_cycle_controller() {
185 return window_cycle_controller_.get(); 186 return window_cycle_controller_.get();
186 } 187 }
187 internal::FocusCycler* focus_cycler() { 188 internal::FocusCycler* focus_cycler() {
188 return focus_cycler_.get(); 189 return focus_cycler_.get();
189 } 190 }
190 191
191 ShellDelegate* delegate() { return delegate_.get(); } 192 ShellDelegate* delegate() { return delegate_.get(); }
192 SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); } 193 SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); }
194 UserWallpaperDelegate* user_wallpaper_delegate() {
195 return user_wallpaper_delegate_.get();
196 }
193 197
194 Launcher* launcher() { return launcher_.get(); } 198 Launcher* launcher() { return launcher_.get(); }
195 199
196 const ScreenAsh* screen() { return screen_; } 200 const ScreenAsh* screen() { return screen_; }
197 201
198 internal::ShelfLayoutManager* shelf() const { return shelf_; } 202 internal::ShelfLayoutManager* shelf() const { return shelf_; }
199 203
200 SystemTray* tray() const { return tray_.get(); } 204 SystemTray* tray() const { return tray_.get(); }
201 205
202 // Returns the size of the grid. 206 // Returns the size of the grid.
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 std::vector<WindowAndBoundsPair> to_restore_; 253 std::vector<WindowAndBoundsPair> to_restore_;
250 254
251 #if !defined(OS_MACOSX) 255 #if !defined(OS_MACOSX)
252 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; 256 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
253 257
254 scoped_ptr<AcceleratorController> accelerator_controller_; 258 scoped_ptr<AcceleratorController> accelerator_controller_;
255 #endif // !defined(OS_MACOSX) 259 #endif // !defined(OS_MACOSX)
256 260
257 scoped_ptr<ShellDelegate> delegate_; 261 scoped_ptr<ShellDelegate> delegate_;
258 scoped_ptr<SystemTrayDelegate> tray_delegate_; 262 scoped_ptr<SystemTrayDelegate> tray_delegate_;
263 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
259 264
260 scoped_ptr<Launcher> launcher_; 265 scoped_ptr<Launcher> launcher_;
261 266
262 scoped_ptr<internal::AppList> app_list_; 267 scoped_ptr<internal::AppList> app_list_;
263 268
264 scoped_ptr<internal::StackingController> stacking_controller_; 269 scoped_ptr<internal::StackingController> stacking_controller_;
265 scoped_ptr<internal::ActivationController> activation_controller_; 270 scoped_ptr<internal::ActivationController> activation_controller_;
266 scoped_ptr<internal::WindowModalityController> window_modality_controller_; 271 scoped_ptr<internal::WindowModalityController> window_modality_controller_;
267 scoped_ptr<internal::DragDropController> drag_drop_controller_; 272 scoped_ptr<internal::DragDropController> drag_drop_controller_;
268 scoped_ptr<internal::WorkspaceController> workspace_controller_; 273 scoped_ptr<internal::WorkspaceController> workspace_controller_;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for 309 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for
305 // |status_widget_|). 310 // |status_widget_|).
306 scoped_ptr<SystemTray> tray_; 311 scoped_ptr<SystemTray> tray_;
307 312
308 DISALLOW_COPY_AND_ASSIGN(Shell); 313 DISALLOW_COPY_AND_ASSIGN(Shell);
309 }; 314 };
310 315
311 } // namespace ash 316 } // namespace ash
312 317
313 #endif // ASH_SHELL_H_ 318 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698