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

Side by Side Diff: ash/shell.h

Issue 1782793002: Ash: Implement Toasts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 4 years, 9 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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 struct ShellInitParams; 134 struct ShellInitParams;
135 class ShellObserver; 135 class ShellObserver;
136 class SlowAnimationEventFilter; 136 class SlowAnimationEventFilter;
137 class StatusAreaWidget; 137 class StatusAreaWidget;
138 class StickyKeysController; 138 class StickyKeysController;
139 class SystemGestureEventFilter; 139 class SystemGestureEventFilter;
140 class SystemModalContainerEventFilter; 140 class SystemModalContainerEventFilter;
141 class SystemTray; 141 class SystemTray;
142 class SystemTrayDelegate; 142 class SystemTrayDelegate;
143 class SystemTrayNotifier; 143 class SystemTrayNotifier;
144 class ToastManager;
144 class ToplevelWindowEventHandler; 145 class ToplevelWindowEventHandler;
145 class TouchTransformerController; 146 class TouchTransformerController;
146 class TouchObserverHUD; 147 class TouchObserverHUD;
147 class UserWallpaperDelegate; 148 class UserWallpaperDelegate;
148 class VirtualKeyboardController; 149 class VirtualKeyboardController;
149 class VideoActivityNotifier; 150 class VideoActivityNotifier;
150 class VideoDetector; 151 class VideoDetector;
151 class WebNotificationTray; 152 class WebNotificationTray;
152 class WindowCycleController; 153 class WindowCycleController;
153 class WindowPositioner; 154 class WindowPositioner;
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 // returned object. 575 // returned object.
575 ash::FirstRunHelper* CreateFirstRunHelper(); 576 ash::FirstRunHelper* CreateFirstRunHelper();
576 577
577 // Toggles cursor compositing on/off. Native cursor is disabled when cursor 578 // Toggles cursor compositing on/off. Native cursor is disabled when cursor
578 // compositing is enabled, and vice versa. 579 // compositing is enabled, and vice versa.
579 void SetCursorCompositingEnabled(bool enabled); 580 void SetCursorCompositingEnabled(bool enabled);
580 581
581 StickyKeysController* sticky_keys_controller() { 582 StickyKeysController* sticky_keys_controller() {
582 return sticky_keys_controller_.get(); 583 return sticky_keys_controller_.get();
583 } 584 }
585
586 ToastManager* toast_manager() const { return toast_manager_.get(); }
oshima 2016/03/11 09:40:24 remove const (because it returns non const member)
yoshiki 2016/03/11 14:30:34 Done.
584 #endif // defined(OS_CHROMEOS) 587 #endif // defined(OS_CHROMEOS)
585 588
586 GPUSupport* gpu_support() { return gpu_support_.get(); } 589 GPUSupport* gpu_support() { return gpu_support_.get(); }
587 590
588 private: 591 private:
589 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 592 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
590 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 593 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
591 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 594 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
592 friend class RootWindowController; 595 friend class RootWindowController;
593 friend class ScopedTargetRootWindow; 596 friend class ScopedTargetRootWindow;
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 scoped_ptr<DisplayManager> display_manager_; 715 scoped_ptr<DisplayManager> display_manager_;
713 scoped_ptr<DisplayConfigurationController> display_configuration_controller_; 716 scoped_ptr<DisplayConfigurationController> display_configuration_controller_;
714 717
715 scoped_ptr<LocaleNotificationController> locale_notification_controller_; 718 scoped_ptr<LocaleNotificationController> locale_notification_controller_;
716 719
717 #if defined(OS_CHROMEOS) 720 #if defined(OS_CHROMEOS)
718 scoped_ptr<PowerEventObserver> power_event_observer_; 721 scoped_ptr<PowerEventObserver> power_event_observer_;
719 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; 722 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
720 scoped_ptr<VideoActivityNotifier> video_activity_notifier_; 723 scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
721 scoped_ptr<StickyKeysController> sticky_keys_controller_; 724 scoped_ptr<StickyKeysController> sticky_keys_controller_;
725 scoped_ptr<ToastManager> toast_manager_;
722 scoped_ptr<ResolutionNotificationController> 726 scoped_ptr<ResolutionNotificationController>
723 resolution_notification_controller_; 727 resolution_notification_controller_;
724 scoped_ptr<BluetoothNotificationController> 728 scoped_ptr<BluetoothNotificationController>
725 bluetooth_notification_controller_; 729 bluetooth_notification_controller_;
726 scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_; 730 scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_;
727 scoped_ptr<LastWindowClosedLogoutReminder> 731 scoped_ptr<LastWindowClosedLogoutReminder>
728 last_window_closed_logout_reminder_; 732 last_window_closed_logout_reminder_;
729 scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_; 733 scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
730 // Controls video output device state. 734 // Controls video output device state.
731 scoped_ptr<ui::DisplayConfigurator> display_configurator_; 735 scoped_ptr<ui::DisplayConfigurator> display_configurator_;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 bool in_mus_ = false; 774 bool in_mus_ = false;
771 775
772 scoped_ptr<KeyboardUI> keyboard_ui_; 776 scoped_ptr<KeyboardUI> keyboard_ui_;
773 777
774 DISALLOW_COPY_AND_ASSIGN(Shell); 778 DISALLOW_COPY_AND_ASSIGN(Shell);
775 }; 779 };
776 780
777 } // namespace ash 781 } // namespace ash
778 782
779 #endif // ASH_SHELL_H_ 783 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/shell.cc » ('j') | ash/system/toast/toast_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698