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

Side by Side Diff: ash/shell.h

Issue 2072853002: Implement "pinned" mode in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 class WmWindow; 165 class WmWindow;
166 166
167 namespace shell { 167 namespace shell {
168 class WindowWatcher; 168 class WindowWatcher;
169 } 169 }
170 170
171 namespace test { 171 namespace test {
172 class ShellTestApi; 172 class ShellTestApi;
173 } 173 }
174 174
175 namespace wm {
176 class PinnedController;
177 }
178
175 // Shell is a singleton object that presents the Shell API and implements the 179 // Shell is a singleton object that presents the Shell API and implements the
176 // RootWindow's delegate interface. 180 // RootWindow's delegate interface.
177 // 181 //
178 // Upon creation, the Shell sets itself as the RootWindow's delegate, which 182 // Upon creation, the Shell sets itself as the RootWindow's delegate, which
179 // takes ownership of the Shell. 183 // takes ownership of the Shell.
180 class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, 184 class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
181 public ui::EventTarget, 185 public ui::EventTarget,
182 public aura::client::ActivationChangeObserver { 186 public aura::client::ActivationChangeObserver {
183 public: 187 public:
184 typedef std::vector<RootWindowController*> RootWindowControllerList; 188 typedef std::vector<RootWindowController*> RootWindowControllerList;
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 // returned object. 585 // returned object.
582 ash::FirstRunHelper* CreateFirstRunHelper(); 586 ash::FirstRunHelper* CreateFirstRunHelper();
583 587
584 // Toggles cursor compositing on/off. Native cursor is disabled when cursor 588 // Toggles cursor compositing on/off. Native cursor is disabled when cursor
585 // compositing is enabled, and vice versa. 589 // compositing is enabled, and vice versa.
586 void SetCursorCompositingEnabled(bool enabled); 590 void SetCursorCompositingEnabled(bool enabled);
587 591
588 StickyKeysController* sticky_keys_controller() { 592 StickyKeysController* sticky_keys_controller() {
589 return sticky_keys_controller_.get(); 593 return sticky_keys_controller_.get();
590 } 594 }
595
596 wm::PinnedController* pinned_controller() { return pinned_controller_.get(); }
591 #endif // defined(OS_CHROMEOS) 597 #endif // defined(OS_CHROMEOS)
592 598
593 ToastManager* toast_manager() { return toast_manager_.get(); } 599 ToastManager* toast_manager() { return toast_manager_.get(); }
594 600
595 GPUSupport* gpu_support() { return gpu_support_.get(); } 601 GPUSupport* gpu_support() { return gpu_support_.get(); }
596 602
597 private: 603 private:
598 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 604 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
599 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 605 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
600 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 606 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 std::unique_ptr<DisplayConfigurationController> 735 std::unique_ptr<DisplayConfigurationController>
730 display_configuration_controller_; 736 display_configuration_controller_;
731 737
732 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; 738 std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
733 739
734 #if defined(OS_CHROMEOS) 740 #if defined(OS_CHROMEOS)
735 std::unique_ptr<PowerEventObserver> power_event_observer_; 741 std::unique_ptr<PowerEventObserver> power_event_observer_;
736 std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; 742 std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
737 std::unique_ptr<VideoActivityNotifier> video_activity_notifier_; 743 std::unique_ptr<VideoActivityNotifier> video_activity_notifier_;
738 std::unique_ptr<StickyKeysController> sticky_keys_controller_; 744 std::unique_ptr<StickyKeysController> sticky_keys_controller_;
745 std::unique_ptr<wm::PinnedController> pinned_controller_;
739 std::unique_ptr<ResolutionNotificationController> 746 std::unique_ptr<ResolutionNotificationController>
740 resolution_notification_controller_; 747 resolution_notification_controller_;
741 std::unique_ptr<BluetoothNotificationController> 748 std::unique_ptr<BluetoothNotificationController>
742 bluetooth_notification_controller_; 749 bluetooth_notification_controller_;
743 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 750 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
744 std::unique_ptr<LastWindowClosedLogoutReminder> 751 std::unique_ptr<LastWindowClosedLogoutReminder>
745 last_window_closed_logout_reminder_; 752 last_window_closed_logout_reminder_;
746 std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_; 753 std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
747 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_; 754 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_;
748 // Controls video output device state. 755 // Controls video output device state.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 bool in_mus_ = false; 794 bool in_mus_ = false;
788 795
789 std::unique_ptr<KeyboardUI> keyboard_ui_; 796 std::unique_ptr<KeyboardUI> keyboard_ui_;
790 797
791 DISALLOW_COPY_AND_ASSIGN(Shell); 798 DISALLOW_COPY_AND_ASSIGN(Shell);
792 }; 799 };
793 800
794 } // namespace ash 801 } // namespace ash
795 802
796 #endif // ASH_SHELL_H_ 803 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698