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

Side by Side Diff: ash/shell.h

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: More refactor 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 class BrightnessController; 42 class BrightnessController;
43 class Launcher; 43 class Launcher;
44 class NestedDispatcherController; 44 class NestedDispatcherController;
45 class PowerButtonController; 45 class PowerButtonController;
46 class PowerStatusController; 46 class PowerStatusController;
47 class ShellDelegate; 47 class ShellDelegate;
48 class SystemTrayDelegate; 48 class SystemTrayDelegate;
49 class SystemTray; 49 class SystemTray;
50 class VideoDetector; 50 class VideoDetector;
51 class WindowCycleController; 51 class WindowCycleController;
52 class DesktopBackgroundController;
flackr 2012/03/05 16:16:03 nit: Sort.
bshe 2012/03/06 01:33:27 Done.
52 53
53 namespace internal { 54 namespace internal {
54 class ActivationController; 55 class ActivationController;
55 class AcceleratorFilter; 56 class AcceleratorFilter;
56 class AppList; 57 class AppList;
57 class DragDropController; 58 class DragDropController;
58 class FocusCycler; 59 class FocusCycler;
59 class InputMethodEventFilter; 60 class InputMethodEventFilter;
60 class PartialScreenshotEventFilter; 61 class PartialScreenshotEventFilter;
61 class RootWindowEventFilter; 62 class RootWindowEventFilter;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 178
178 internal::RootWindowEventFilter* root_filter() { 179 internal::RootWindowEventFilter* root_filter() {
179 return root_filter_; 180 return root_filter_;
180 } 181 }
181 internal::TooltipController* tooltip_controller() { 182 internal::TooltipController* tooltip_controller() {
182 return tooltip_controller_.get(); 183 return tooltip_controller_.get();
183 } 184 }
184 internal::PartialScreenshotEventFilter* partial_screenshot_filter() { 185 internal::PartialScreenshotEventFilter* partial_screenshot_filter() {
185 return partial_screenshot_filter_.get(); 186 return partial_screenshot_filter_.get();
186 } 187 }
188 DesktopBackgroundController* desktop_background_controller() {
189 return desktop_background_controller_.get();
190 }
187 PowerButtonController* power_button_controller() { 191 PowerButtonController* power_button_controller() {
188 return power_button_controller_.get(); 192 return power_button_controller_.get();
189 } 193 }
190 VideoDetector* video_detector() { 194 VideoDetector* video_detector() {
191 return video_detector_.get(); 195 return video_detector_.get();
192 } 196 }
193 WindowCycleController* window_cycle_controller() { 197 WindowCycleController* window_cycle_controller() {
194 return window_cycle_controller_.get(); 198 return window_cycle_controller_.get();
195 } 199 }
196 AudioController* audio_controller() const { 200 AudioController* audio_controller() const {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 scoped_ptr<internal::AppList> app_list_; 286 scoped_ptr<internal::AppList> app_list_;
283 287
284 scoped_ptr<internal::StackingController> stacking_controller_; 288 scoped_ptr<internal::StackingController> stacking_controller_;
285 scoped_ptr<internal::ActivationController> activation_controller_; 289 scoped_ptr<internal::ActivationController> activation_controller_;
286 scoped_ptr<internal::WindowModalityController> window_modality_controller_; 290 scoped_ptr<internal::WindowModalityController> window_modality_controller_;
287 scoped_ptr<internal::DragDropController> drag_drop_controller_; 291 scoped_ptr<internal::DragDropController> drag_drop_controller_;
288 scoped_ptr<internal::WorkspaceController> workspace_controller_; 292 scoped_ptr<internal::WorkspaceController> workspace_controller_;
289 scoped_ptr<internal::ShadowController> shadow_controller_; 293 scoped_ptr<internal::ShadowController> shadow_controller_;
290 scoped_ptr<internal::TooltipController> tooltip_controller_; 294 scoped_ptr<internal::TooltipController> tooltip_controller_;
291 scoped_ptr<internal::VisibilityController> visibility_controller_; 295 scoped_ptr<internal::VisibilityController> visibility_controller_;
296 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
292 scoped_ptr<PowerButtonController> power_button_controller_; 297 scoped_ptr<PowerButtonController> power_button_controller_;
293 scoped_ptr<VideoDetector> video_detector_; 298 scoped_ptr<VideoDetector> video_detector_;
294 scoped_ptr<WindowCycleController> window_cycle_controller_; 299 scoped_ptr<WindowCycleController> window_cycle_controller_;
295 scoped_ptr<internal::FocusCycler> focus_cycler_; 300 scoped_ptr<internal::FocusCycler> focus_cycler_;
296 301
297 // These controllers are not owned by the shell. 302 // These controllers are not owned by the shell.
298 AudioController* audio_controller_; 303 AudioController* audio_controller_;
299 BrightnessController* brightness_controller_; 304 BrightnessController* brightness_controller_;
300 PowerStatusController* power_status_controller_; 305 PowerStatusController* power_status_controller_;
301 306
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 // Offset between the corner of the status area and the corner of the screen 340 // Offset between the corner of the status area and the corner of the screen
336 // when in the compact window mode. 341 // when in the compact window mode.
337 gfx::Size compact_status_area_offset_; 342 gfx::Size compact_status_area_offset_;
338 343
339 DISALLOW_COPY_AND_ASSIGN(Shell); 344 DISALLOW_COPY_AND_ASSIGN(Shell);
340 }; 345 };
341 346
342 } // namespace ash 347 } // namespace ash
343 348
344 #endif // ASH_SHELL_H_ 349 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698