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

Side by Side Diff: ash/shell.h

Issue 183853010: Bluetooth: notify user of incoming pairing requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add dependency to hopefully fix linux_chromeos build failure Created 6 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
« no previous file with comments | « ash/ash_chromeos_strings.grdp ('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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 class UserWallpaperDelegate; 111 class UserWallpaperDelegate;
112 class VideoDetector; 112 class VideoDetector;
113 class WebNotificationTray; 113 class WebNotificationTray;
114 class WindowCycleController; 114 class WindowCycleController;
115 class WindowPositioner; 115 class WindowPositioner;
116 class WindowSelectorController; 116 class WindowSelectorController;
117 117
118 namespace internal { 118 namespace internal {
119 class AcceleratorFilter; 119 class AcceleratorFilter;
120 class AppListController; 120 class AppListController;
121 class BluetoothNotificationController;
121 class CaptureController; 122 class CaptureController;
122 class DisplayChangeObserver; 123 class DisplayChangeObserver;
123 class DisplayErrorObserver; 124 class DisplayErrorObserver;
124 class DisplayManager; 125 class DisplayManager;
125 class DragDropController; 126 class DragDropController;
126 class EventClientImpl; 127 class EventClientImpl;
127 class EventRewriterEventFilter; 128 class EventRewriterEventFilter;
128 class EventTransformationHandler; 129 class EventTransformationHandler;
129 class FocusCycler; 130 class FocusCycler;
130 class KeyboardUMAEventFilter; 131 class KeyboardUMAEventFilter;
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 // The maximized window manager (if enabled). 692 // The maximized window manager (if enabled).
692 scoped_ptr<internal::MaximizeModeWindowManager> maximize_mode_window_manager_; 693 scoped_ptr<internal::MaximizeModeWindowManager> maximize_mode_window_manager_;
693 694
694 #if defined(OS_CHROMEOS) 695 #if defined(OS_CHROMEOS)
695 scoped_ptr<internal::PowerEventObserver> power_event_observer_; 696 scoped_ptr<internal::PowerEventObserver> power_event_observer_;
696 scoped_ptr<internal::UserActivityNotifier> user_activity_notifier_; 697 scoped_ptr<internal::UserActivityNotifier> user_activity_notifier_;
697 scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_; 698 scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_;
698 scoped_ptr<StickyKeysController> sticky_keys_controller_; 699 scoped_ptr<StickyKeysController> sticky_keys_controller_;
699 scoped_ptr<internal::ResolutionNotificationController> 700 scoped_ptr<internal::ResolutionNotificationController>
700 resolution_notification_controller_; 701 resolution_notification_controller_;
702 scoped_ptr<internal::BluetoothNotificationController>
703 bluetooth_notification_controller_;
701 #if defined(USE_X11) 704 #if defined(USE_X11)
702 // Controls video output device state. 705 // Controls video output device state.
703 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; 706 scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
704 scoped_ptr<internal::OutputConfiguratorAnimation> 707 scoped_ptr<internal::OutputConfiguratorAnimation>
705 output_configurator_animation_; 708 output_configurator_animation_;
706 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; 709 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_;
707 scoped_ptr<internal::ProjectingObserver> projecting_observer_; 710 scoped_ptr<internal::ProjectingObserver> projecting_observer_;
708 711
709 // Listens for output changes and updates the display manager. 712 // Listens for output changes and updates the display manager.
710 scoped_ptr<internal::DisplayChangeObserver> display_change_observer_; 713 scoped_ptr<internal::DisplayChangeObserver> display_change_observer_;
(...skipping 17 matching lines...) Expand all
728 731
729 // Injected content::GPUDataManager support. 732 // Injected content::GPUDataManager support.
730 scoped_ptr<GPUSupport> gpu_support_; 733 scoped_ptr<GPUSupport> gpu_support_;
731 734
732 DISALLOW_COPY_AND_ASSIGN(Shell); 735 DISALLOW_COPY_AND_ASSIGN(Shell);
733 }; 736 };
734 737
735 } // namespace ash 738 } // namespace ash
736 739
737 #endif // ASH_SHELL_H_ 740 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash_chromeos_strings.grdp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698