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

Side by Side Diff: ash/shell.h

Issue 2157393002: Moves WindowCycleList/Controller to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback and std::move Created 4 years, 5 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/mus/bridge/wm_window_mus.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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 class SystemTray; 139 class SystemTray;
140 class ToastManager; 140 class ToastManager;
141 class ToplevelWindowEventHandler; 141 class ToplevelWindowEventHandler;
142 class TouchTransformerController; 142 class TouchTransformerController;
143 class TouchObserverHUD; 143 class TouchObserverHUD;
144 class UserWallpaperDelegate; 144 class UserWallpaperDelegate;
145 class VirtualKeyboardController; 145 class VirtualKeyboardController;
146 class VideoActivityNotifier; 146 class VideoActivityNotifier;
147 class VideoDetector; 147 class VideoDetector;
148 class WebNotificationTray; 148 class WebNotificationTray;
149 class WindowCycleController;
150 class WindowPositioner; 149 class WindowPositioner;
151 class WmShellAura; 150 class WmShellAura;
152 class WmWindow; 151 class WmWindow;
153 152
154 namespace shell { 153 namespace shell {
155 class WindowWatcher; 154 class WindowWatcher;
156 } 155 }
157 156
158 namespace test { 157 namespace test {
159 class ShellTestApi; 158 class ShellTestApi;
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 LinkHandlerModelFactory* link_handler_model_factory) { 332 LinkHandlerModelFactory* link_handler_model_factory) {
334 link_handler_model_factory_ = link_handler_model_factory; 333 link_handler_model_factory_ = link_handler_model_factory;
335 } 334 }
336 PowerButtonController* power_button_controller() { 335 PowerButtonController* power_button_controller() {
337 return power_button_controller_.get(); 336 return power_button_controller_.get();
338 } 337 }
339 LockStateController* lock_state_controller() { 338 LockStateController* lock_state_controller() {
340 return lock_state_controller_.get(); 339 return lock_state_controller_.get();
341 } 340 }
342 VideoDetector* video_detector() { return video_detector_.get(); } 341 VideoDetector* video_detector() { return video_detector_.get(); }
343 WindowCycleController* window_cycle_controller() {
344 return window_cycle_controller_.get();
345 }
346 WindowTreeHostManager* window_tree_host_manager() { 342 WindowTreeHostManager* window_tree_host_manager() {
347 return window_tree_host_manager_.get(); 343 return window_tree_host_manager_.get();
348 } 344 }
349 #if defined(OS_CHROMEOS) 345 #if defined(OS_CHROMEOS)
350 PowerEventObserver* power_event_observer() { 346 PowerEventObserver* power_event_observer() {
351 return power_event_observer_.get(); 347 return power_event_observer_.get();
352 } 348 }
353 TouchTransformerController* touch_transformer_controller() { 349 TouchTransformerController* touch_transformer_controller() {
354 return touch_transformer_controller_.get(); 350 return touch_transformer_controller_.get();
355 } 351 }
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 std::unique_ptr<::wm::ShadowController> shadow_controller_; 599 std::unique_ptr<::wm::ShadowController> shadow_controller_;
604 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 600 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
605 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 601 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
606 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 602 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
607 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; 603 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_;
608 LinkHandlerModelFactory* link_handler_model_factory_; 604 LinkHandlerModelFactory* link_handler_model_factory_;
609 std::unique_ptr<PowerButtonController> power_button_controller_; 605 std::unique_ptr<PowerButtonController> power_button_controller_;
610 std::unique_ptr<LockStateController> lock_state_controller_; 606 std::unique_ptr<LockStateController> lock_state_controller_;
611 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; 607 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
612 std::unique_ptr<VideoDetector> video_detector_; 608 std::unique_ptr<VideoDetector> video_detector_;
613 std::unique_ptr<WindowCycleController> window_cycle_controller_;
614 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; 609 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
615 std::unique_ptr<HighContrastController> high_contrast_controller_; 610 std::unique_ptr<HighContrastController> high_contrast_controller_;
616 std::unique_ptr<MagnificationController> magnification_controller_; 611 std::unique_ptr<MagnificationController> magnification_controller_;
617 std::unique_ptr<PartialMagnificationController> 612 std::unique_ptr<PartialMagnificationController>
618 partial_magnification_controller_; 613 partial_magnification_controller_;
619 std::unique_ptr<AutoclickController> autoclick_controller_; 614 std::unique_ptr<AutoclickController> autoclick_controller_;
620 std::unique_ptr<aura::client::FocusClient> focus_client_; 615 std::unique_ptr<aura::client::FocusClient> focus_client_;
621 616
622 aura::client::ActivationClient* activation_client_; 617 aura::client::ActivationClient* activation_client_;
623 618
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 base::SequencedWorkerPool* blocking_pool_; 697 base::SequencedWorkerPool* blocking_pool_;
703 698
704 bool in_mus_ = false; 699 bool in_mus_ = false;
705 700
706 DISALLOW_COPY_AND_ASSIGN(Shell); 701 DISALLOW_COPY_AND_ASSIGN(Shell);
707 }; 702 };
708 703
709 } // namespace ash 704 } // namespace ash
710 705
711 #endif // ASH_SHELL_H_ 706 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_window_mus.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698