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

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: Create a dummy class to fix test fail. 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
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/shell.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_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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 } 190 }
190 WindowCycleController* window_cycle_controller() { 191 WindowCycleController* window_cycle_controller() {
191 return window_cycle_controller_.get(); 192 return window_cycle_controller_.get();
192 } 193 }
193 internal::FocusCycler* focus_cycler() { 194 internal::FocusCycler* focus_cycler() {
194 return focus_cycler_.get(); 195 return focus_cycler_.get();
195 } 196 }
196 197
197 ShellDelegate* delegate() { return delegate_.get(); } 198 ShellDelegate* delegate() { return delegate_.get(); }
198 SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); } 199 SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); }
200 UserWallpaperDelegate* user_wallpaper_delegate() {
201 return user_wallpaper_delegate_.get();
202 }
199 203
200 Launcher* launcher() { return launcher_.get(); } 204 Launcher* launcher() { return launcher_.get(); }
201 205
202 const ScreenAsh* screen() { return screen_; } 206 const ScreenAsh* screen() { return screen_; }
203 207
204 internal::ShelfLayoutManager* shelf() const { return shelf_; } 208 internal::ShelfLayoutManager* shelf() const { return shelf_; }
205 209
206 SystemTray* tray() const { return tray_.get(); } 210 SystemTray* tray() const { return tray_.get(); }
207 211
208 // Returns the size of the grid. 212 // Returns the size of the grid.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 std::vector<WindowAndBoundsPair> to_restore_; 256 std::vector<WindowAndBoundsPair> to_restore_;
253 257
254 #if !defined(OS_MACOSX) 258 #if !defined(OS_MACOSX)
255 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; 259 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
256 260
257 scoped_ptr<AcceleratorController> accelerator_controller_; 261 scoped_ptr<AcceleratorController> accelerator_controller_;
258 #endif // !defined(OS_MACOSX) 262 #endif // !defined(OS_MACOSX)
259 263
260 scoped_ptr<ShellDelegate> delegate_; 264 scoped_ptr<ShellDelegate> delegate_;
261 scoped_ptr<SystemTrayDelegate> tray_delegate_; 265 scoped_ptr<SystemTrayDelegate> tray_delegate_;
266 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
262 267
263 scoped_ptr<Launcher> launcher_; 268 scoped_ptr<Launcher> launcher_;
264 269
265 scoped_ptr<internal::AppList> app_list_; 270 scoped_ptr<internal::AppList> app_list_;
266 271
267 scoped_ptr<internal::StackingController> stacking_controller_; 272 scoped_ptr<internal::StackingController> stacking_controller_;
268 scoped_ptr<internal::ActivationController> activation_controller_; 273 scoped_ptr<internal::ActivationController> activation_controller_;
269 scoped_ptr<internal::WindowModalityController> window_modality_controller_; 274 scoped_ptr<internal::WindowModalityController> window_modality_controller_;
270 scoped_ptr<internal::DragDropController> drag_drop_controller_; 275 scoped_ptr<internal::DragDropController> drag_drop_controller_;
271 scoped_ptr<internal::WorkspaceController> workspace_controller_; 276 scoped_ptr<internal::WorkspaceController> workspace_controller_;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for 313 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for
309 // |status_widget_|). 314 // |status_widget_|).
310 scoped_ptr<SystemTray> tray_; 315 scoped_ptr<SystemTray> tray_;
311 316
312 DISALLOW_COPY_AND_ASSIGN(Shell); 317 DISALLOW_COPY_AND_ASSIGN(Shell);
313 }; 318 };
314 319
315 } // namespace ash 320 } // namespace ash
316 321
317 #endif // ASH_SHELL_H_ 322 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698