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

Side by Side Diff: ash/shell.h

Issue 2290473004: Rename ash desktop_background to wallpaper. (Closed)
Patch Set: Address comments. Created 4 years, 3 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/root_window_controller_unittest.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 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 class VisibilityController; 71 class VisibilityController;
72 class WindowModalityController; 72 class WindowModalityController;
73 } 73 }
74 74
75 namespace ash { 75 namespace ash {
76 76
77 class AcceleratorControllerDelegateAura; 77 class AcceleratorControllerDelegateAura;
78 class AshNativeCursorManager; 78 class AshNativeCursorManager;
79 class AutoclickController; 79 class AutoclickController;
80 class BluetoothNotificationController; 80 class BluetoothNotificationController;
81 class DesktopBackgroundController;
82 class DisplayChangeObserver; 81 class DisplayChangeObserver;
83 class DisplayColorManager; 82 class DisplayColorManager;
84 class DisplayConfigurationController; 83 class DisplayConfigurationController;
85 class WindowTreeHostManager;
86 class DisplayErrorObserver; 84 class DisplayErrorObserver;
87 class DisplayManager; 85 class DisplayManager;
88 class DragDropController; 86 class DragDropController;
89 class EventClientImpl; 87 class EventClientImpl;
90 class EventRewriterEventFilter; 88 class EventRewriterEventFilter;
91 class EventTransformationHandler; 89 class EventTransformationHandler;
92 class FirstRunHelper; 90 class FirstRunHelper;
93 class GPUSupport; 91 class GPUSupport;
94 class HighContrastController; 92 class HighContrastController;
95 class ImmersiveHandlerFactoryAsh; 93 class ImmersiveHandlerFactoryAsh;
(...skipping 27 matching lines...) Expand all
123 class StylusMetricsRecorder; 121 class StylusMetricsRecorder;
124 class SystemGestureEventFilter; 122 class SystemGestureEventFilter;
125 class SystemModalContainerEventFilter; 123 class SystemModalContainerEventFilter;
126 class SystemTray; 124 class SystemTray;
127 class ToplevelWindowEventHandler; 125 class ToplevelWindowEventHandler;
128 class TouchTransformerController; 126 class TouchTransformerController;
129 class TouchObserverHUD; 127 class TouchObserverHUD;
130 class VirtualKeyboardController; 128 class VirtualKeyboardController;
131 class VideoActivityNotifier; 129 class VideoActivityNotifier;
132 class VideoDetector; 130 class VideoDetector;
131 class WallpaperController;
133 class WebNotificationTray; 132 class WebNotificationTray;
134 class WindowPositioner; 133 class WindowPositioner;
134 class WindowTreeHostManager;
135 class WmShellAura; 135 class WmShellAura;
136 class WmWindow; 136 class WmWindow;
137 137
138 namespace shell { 138 namespace shell {
139 class WindowWatcher; 139 class WindowWatcher;
140 } 140 }
141 141
142 namespace test { 142 namespace test {
143 class ShellTestApi; 143 class ShellTestApi;
144 } 144 }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 static const aura::Window* GetContainer(const aura::Window* root_window, 197 static const aura::Window* GetContainer(const aura::Window* root_window,
198 int container_id); 198 int container_id);
199 199
200 // Returns the list of containers that match |container_id| in 200 // Returns the list of containers that match |container_id| in
201 // all root windows. If |priority_root| is given, the container 201 // all root windows. If |priority_root| is given, the container
202 // in the |priority_root| will be inserted at the top of the list. 202 // in the |priority_root| will be inserted at the top of the list.
203 static std::vector<aura::Window*> GetContainersFromAllRootWindows( 203 static std::vector<aura::Window*> GetContainersFromAllRootWindows(
204 int container_id, 204 int container_id,
205 aura::Window* priority_root); 205 aura::Window* priority_root);
206 206
207 // Shows the context menu for the background and launcher at 207 // Shows the context menu for the wallpaper and shelf at the screen location.
208 // |location_in_screen| (in screen coordinates).
209 void ShowContextMenu(const gfx::Point& location_in_screen, 208 void ShowContextMenu(const gfx::Point& location_in_screen,
210 ui::MenuSourceType source_type); 209 ui::MenuSourceType source_type);
211 210
212 // Creates a default views::NonClientFrameView for use by windows in the 211 // Creates a default views::NonClientFrameView for use by windows in the
213 // Ash environment. 212 // Ash environment.
214 views::NonClientFrameView* CreateDefaultNonClientFrameView( 213 views::NonClientFrameView* CreateDefaultNonClientFrameView(
215 views::Widget* widget); 214 views::Widget* widget);
216 215
217 // Sets work area insets of the display containing |window|, pings observers. 216 // Sets work area insets of the display containing |window|, pings observers.
218 void SetDisplayWorkAreaInsets(aura::Window* window, 217 void SetDisplayWorkAreaInsets(aura::Window* window,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 267
269 DisplayManager* display_manager() { return display_manager_.get(); } 268 DisplayManager* display_manager() { return display_manager_.get(); }
270 DisplayConfigurationController* display_configuration_controller() { 269 DisplayConfigurationController* display_configuration_controller() {
271 return display_configuration_controller_.get(); 270 return display_configuration_controller_.get();
272 } 271 }
273 ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); } 272 ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); }
274 views::corewm::TooltipController* tooltip_controller() { 273 views::corewm::TooltipController* tooltip_controller() {
275 return tooltip_controller_.get(); 274 return tooltip_controller_.get();
276 } 275 }
277 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); } 276 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); }
278 DesktopBackgroundController* desktop_background_controller() { 277 WallpaperController* wallpaper_controller() {
279 return desktop_background_controller_.get(); 278 return wallpaper_controller_.get();
280 } 279 }
281 LinkHandlerModelFactory* link_handler_model_factory() { 280 LinkHandlerModelFactory* link_handler_model_factory() {
282 return link_handler_model_factory_; 281 return link_handler_model_factory_;
283 } 282 }
284 void set_link_handler_model_factory( 283 void set_link_handler_model_factory(
285 LinkHandlerModelFactory* link_handler_model_factory) { 284 LinkHandlerModelFactory* link_handler_model_factory) {
286 link_handler_model_factory_ = link_handler_model_factory; 285 link_handler_model_factory_ = link_handler_model_factory;
287 } 286 }
288 PowerButtonController* power_button_controller() { 287 PowerButtonController* power_button_controller() {
289 return power_button_controller_.get(); 288 return power_button_controller_.get();
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 accelerator_controller_delegate_; 492 accelerator_controller_delegate_;
494 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 493 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
495 std::unique_ptr<WindowPositioner> window_positioner_; 494 std::unique_ptr<WindowPositioner> window_positioner_;
496 495
497 std::unique_ptr<DragDropController> drag_drop_controller_; 496 std::unique_ptr<DragDropController> drag_drop_controller_;
498 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 497 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
499 std::unique_ptr<::wm::ShadowController> shadow_controller_; 498 std::unique_ptr<::wm::ShadowController> shadow_controller_;
500 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 499 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
501 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 500 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
502 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 501 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
503 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; 502 std::unique_ptr<WallpaperController> wallpaper_controller_;
504 LinkHandlerModelFactory* link_handler_model_factory_; 503 LinkHandlerModelFactory* link_handler_model_factory_;
505 std::unique_ptr<PowerButtonController> power_button_controller_; 504 std::unique_ptr<PowerButtonController> power_button_controller_;
506 std::unique_ptr<LockStateController> lock_state_controller_; 505 std::unique_ptr<LockStateController> lock_state_controller_;
507 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; 506 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
508 std::unique_ptr<VideoDetector> video_detector_; 507 std::unique_ptr<VideoDetector> video_detector_;
509 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; 508 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
510 std::unique_ptr<HighContrastController> high_contrast_controller_; 509 std::unique_ptr<HighContrastController> high_contrast_controller_;
511 std::unique_ptr<MagnificationController> magnification_controller_; 510 std::unique_ptr<MagnificationController> magnification_controller_;
512 std::unique_ptr<PartialMagnificationController> 511 std::unique_ptr<PartialMagnificationController>
513 partial_magnification_controller_; 512 partial_magnification_controller_;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 base::SequencedWorkerPool* blocking_pool_; 594 base::SequencedWorkerPool* blocking_pool_;
596 595
597 bool in_mus_ = false; 596 bool in_mus_ = false;
598 597
599 DISALLOW_COPY_AND_ASSIGN(Shell); 598 DISALLOW_COPY_AND_ASSIGN(Shell);
600 }; 599 };
601 600
602 } // namespace ash 601 } // namespace ash
603 602
604 #endif // ASH_SHELL_H_ 603 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698