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

Side by Side Diff: ash/shell.h

Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order 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_shell_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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 class EventTransformationHandler; 100 class EventTransformationHandler;
101 class FirstRunHelper; 101 class FirstRunHelper;
102 class GPUSupport; 102 class GPUSupport;
103 class HighContrastController; 103 class HighContrastController;
104 class KeyboardUMAEventFilter; 104 class KeyboardUMAEventFilter;
105 class LinkHandlerModelFactory; 105 class LinkHandlerModelFactory;
106 class LocaleNotificationController; 106 class LocaleNotificationController;
107 class LockStateController; 107 class LockStateController;
108 enum class LoginStatus; 108 enum class LoginStatus;
109 class MagnificationController; 109 class MagnificationController;
110 class MaximizeModeController;
111 class MaximizeModeWindowManager;
112 class MouseCursorEventFilter; 110 class MouseCursorEventFilter;
113 class NewWindowDelegate; 111 class NewWindowDelegate;
114 class OverlayEventFilter; 112 class OverlayEventFilter;
115 class PartialMagnificationController; 113 class PartialMagnificationController;
116 class PointerWatcherDelegate; 114 class PointerWatcherDelegate;
117 class PowerButtonController; 115 class PowerButtonController;
118 class PowerEventObserver; 116 class PowerEventObserver;
119 class ProjectingObserver; 117 class ProjectingObserver;
120 class ResizeShadowController; 118 class ResizeShadowController;
121 class ResolutionNotificationController; 119 class ResolutionNotificationController;
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 } 455 }
458 456
459 // Made available for tests. 457 // Made available for tests.
460 ::wm::ShadowController* shadow_controller() { 458 ::wm::ShadowController* shadow_controller() {
461 return shadow_controller_.get(); 459 return shadow_controller_.get();
462 } 460 }
463 461
464 // Starts the animation that occurs on first login. 462 // Starts the animation that occurs on first login.
465 void DoInitialWorkspaceAnimation(); 463 void DoInitialWorkspaceAnimation();
466 464
467 MaximizeModeController* maximize_mode_controller() {
468 return maximize_mode_controller_.get();
469 }
470
471 #if defined(OS_CHROMEOS) 465 #if defined(OS_CHROMEOS)
472 // TODO(oshima): Move these objects to WindowTreeHostManager. 466 // TODO(oshima): Move these objects to WindowTreeHostManager.
473 ui::DisplayConfigurator* display_configurator() { 467 ui::DisplayConfigurator* display_configurator() {
474 return display_configurator_.get(); 468 return display_configurator_.get();
475 } 469 }
476 DisplayErrorObserver* display_error_observer() { 470 DisplayErrorObserver* display_error_observer() {
477 return display_error_observer_.get(); 471 return display_error_observer_.get();
478 } 472 }
479 473
480 ResolutionNotificationController* resolution_notification_controller() { 474 ResolutionNotificationController* resolution_notification_controller() {
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 // Implements content::ScreenOrientationController for ChromeOS 685 // Implements content::ScreenOrientationController for ChromeOS
692 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; 686 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_;
693 687
694 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; 688 std::unique_ptr<TouchTransformerController> touch_transformer_controller_;
695 689
696 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 690 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
697 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; 691 std::unique_ptr<ui::EventHandler> speech_feedback_handler_;
698 #endif // defined(OS_CHROMEOS) 692 #endif // defined(OS_CHROMEOS)
699 693
700 std::unique_ptr<ToastManager> toast_manager_; 694 std::unique_ptr<ToastManager> toast_manager_;
701 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
702 695
703 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a 696 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
704 // pointer to vend to test code. 697 // pointer to vend to test code.
705 AshNativeCursorManager* native_cursor_manager_; 698 AshNativeCursorManager* native_cursor_manager_;
706 699
707 // Cursor may be hidden on certain key events in ChromeOS, whereas we never 700 // Cursor may be hidden on certain key events in ChromeOS, whereas we never
708 // hide the cursor on Windows. 701 // hide the cursor on Windows.
709 std::unique_ptr<::wm::CursorManager> cursor_manager_; 702 std::unique_ptr<::wm::CursorManager> cursor_manager_;
710 703
711 // For testing only: simulate that a modal window is open 704 // For testing only: simulate that a modal window is open
712 bool simulate_modal_window_open_for_testing_; 705 bool simulate_modal_window_open_for_testing_;
713 706
714 bool is_touch_hud_projection_enabled_; 707 bool is_touch_hud_projection_enabled_;
715 708
716 // Injected content::GPUDataManager support. 709 // Injected content::GPUDataManager support.
717 std::unique_ptr<GPUSupport> gpu_support_; 710 std::unique_ptr<GPUSupport> gpu_support_;
718 711
719 base::SequencedWorkerPool* blocking_pool_; 712 base::SequencedWorkerPool* blocking_pool_;
720 713
721 bool in_mus_ = false; 714 bool in_mus_ = false;
722 715
723 DISALLOW_COPY_AND_ASSIGN(Shell); 716 DISALLOW_COPY_AND_ASSIGN(Shell);
724 }; 717 };
725 718
726 } // namespace ash 719 } // namespace ash
727 720
728 #endif // ASH_SHELL_H_ 721 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698