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

Side by Side Diff: ash/shell.h

Issue 2171493002: Moves ToastManager from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove include 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 class ShelfModel; 131 class ShelfModel;
132 class ShelfWindowWatcher; 132 class ShelfWindowWatcher;
133 class ShellDelegate; 133 class ShellDelegate;
134 struct ShellInitParams; 134 struct ShellInitParams;
135 class SlowAnimationEventFilter; 135 class SlowAnimationEventFilter;
136 class StatusAreaWidget; 136 class StatusAreaWidget;
137 class StickyKeysController; 137 class StickyKeysController;
138 class SystemGestureEventFilter; 138 class SystemGestureEventFilter;
139 class SystemModalContainerEventFilter; 139 class SystemModalContainerEventFilter;
140 class SystemTray; 140 class SystemTray;
141 class ToastManager;
142 class ToplevelWindowEventHandler; 141 class ToplevelWindowEventHandler;
143 class TouchTransformerController; 142 class TouchTransformerController;
144 class TouchObserverHUD; 143 class TouchObserverHUD;
145 class UserWallpaperDelegate; 144 class UserWallpaperDelegate;
146 class VirtualKeyboardController; 145 class VirtualKeyboardController;
147 class VideoActivityNotifier; 146 class VideoActivityNotifier;
148 class VideoDetector; 147 class VideoDetector;
149 class WebNotificationTray; 148 class WebNotificationTray;
150 class WindowPositioner; 149 class WindowPositioner;
151 class WmShellAura; 150 class WmShellAura;
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 StickyKeysController* sticky_keys_controller() { 510 StickyKeysController* sticky_keys_controller() {
512 return sticky_keys_controller_.get(); 511 return sticky_keys_controller_.get();
513 } 512 }
514 513
515 #endif // defined(OS_CHROMEOS) 514 #endif // defined(OS_CHROMEOS)
516 515
517 ScreenPinningController* screen_pinning_controller() { 516 ScreenPinningController* screen_pinning_controller() {
518 return screen_pinning_controller_.get(); 517 return screen_pinning_controller_.get();
519 } 518 }
520 519
521 ToastManager* toast_manager() { return toast_manager_.get(); }
522
523 GPUSupport* gpu_support() { return gpu_support_.get(); } 520 GPUSupport* gpu_support() { return gpu_support_.get(); }
524 521
525 private: 522 private:
526 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 523 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
527 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 524 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
528 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 525 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
529 friend class RootWindowController; 526 friend class RootWindowController;
530 friend class ScopedTargetRootWindow; 527 friend class ScopedTargetRootWindow;
531 friend class test::ShellTestApi; 528 friend class test::ShellTestApi;
532 friend class shell::WindowWatcher; 529 friend class shell::WindowWatcher;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 672
676 // Implements content::ScreenOrientationController for ChromeOS 673 // Implements content::ScreenOrientationController for ChromeOS
677 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; 674 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_;
678 675
679 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; 676 std::unique_ptr<TouchTransformerController> touch_transformer_controller_;
680 677
681 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 678 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
682 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; 679 std::unique_ptr<ui::EventHandler> speech_feedback_handler_;
683 #endif // defined(OS_CHROMEOS) 680 #endif // defined(OS_CHROMEOS)
684 681
685 std::unique_ptr<ToastManager> toast_manager_;
686
687 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a 682 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
688 // pointer to vend to test code. 683 // pointer to vend to test code.
689 AshNativeCursorManager* native_cursor_manager_; 684 AshNativeCursorManager* native_cursor_manager_;
690 685
691 // Cursor may be hidden on certain key events in ChromeOS, whereas we never 686 // Cursor may be hidden on certain key events in ChromeOS, whereas we never
692 // hide the cursor on Windows. 687 // hide the cursor on Windows.
693 std::unique_ptr<::wm::CursorManager> cursor_manager_; 688 std::unique_ptr<::wm::CursorManager> cursor_manager_;
694 689
695 // For testing only: simulate that a modal window is open 690 // For testing only: simulate that a modal window is open
696 bool simulate_modal_window_open_for_testing_; 691 bool simulate_modal_window_open_for_testing_;
697 692
698 bool is_touch_hud_projection_enabled_; 693 bool is_touch_hud_projection_enabled_;
699 694
700 // Injected content::GPUDataManager support. 695 // Injected content::GPUDataManager support.
701 std::unique_ptr<GPUSupport> gpu_support_; 696 std::unique_ptr<GPUSupport> gpu_support_;
702 697
703 base::SequencedWorkerPool* blocking_pool_; 698 base::SequencedWorkerPool* blocking_pool_;
704 699
705 bool in_mus_ = false; 700 bool in_mus_ = false;
706 701
707 DISALLOW_COPY_AND_ASSIGN(Shell); 702 DISALLOW_COPY_AND_ASSIGN(Shell);
708 }; 703 };
709 704
710 } // namespace ash 705 } // namespace ash
711 706
712 #endif // ASH_SHELL_H_ 707 #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