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

Side by Side Diff: ash/common/wm_shell.h

Issue 2420753002: ash: Use mojo LocaleNotificationController interface. (Closed)
Patch Set: Uniquify callbacks Created 4 years, 2 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/common/system/tray/system_tray_notifier.cc ('k') | ash/common/wm_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_WM_SHELL_H_ 5 #ifndef ASH_COMMON_WM_SHELL_H_
6 #define ASH_COMMON_WM_SHELL_H_ 6 #define ASH_COMMON_WM_SHELL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 class AcceleratorController; 48 class AcceleratorController;
49 class AccessibilityDelegate; 49 class AccessibilityDelegate;
50 class BrightnessControlDelegate; 50 class BrightnessControlDelegate;
51 class FocusCycler; 51 class FocusCycler;
52 class ImmersiveContextAsh; 52 class ImmersiveContextAsh;
53 class ImmersiveFullscreenController; 53 class ImmersiveFullscreenController;
54 class KeyEventWatcher; 54 class KeyEventWatcher;
55 class KeyboardBrightnessControlDelegate; 55 class KeyboardBrightnessControlDelegate;
56 class KeyboardUI; 56 class KeyboardUI;
57 class LocaleNotificationController;
57 class MaximizeModeController; 58 class MaximizeModeController;
58 class MruWindowTracker; 59 class MruWindowTracker;
59 class NewWindowDelegate; 60 class NewWindowDelegate;
60 class PaletteDelegate; 61 class PaletteDelegate;
61 class ScopedDisableInternalMouseAndKeyboard; 62 class ScopedDisableInternalMouseAndKeyboard;
62 class SessionStateDelegate; 63 class SessionStateDelegate;
63 class ShelfController; 64 class ShelfController;
64 class ShelfDelegate; 65 class ShelfDelegate;
65 class ShelfModel; 66 class ShelfModel;
66 class ShelfWindowWatcher; 67 class ShelfWindowWatcher;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 } 122 }
122 123
123 FocusCycler* focus_cycler() { return focus_cycler_.get(); } 124 FocusCycler* focus_cycler() { return focus_cycler_.get(); }
124 125
125 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() { 126 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() {
126 return keyboard_brightness_control_delegate_.get(); 127 return keyboard_brightness_control_delegate_.get();
127 } 128 }
128 129
129 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); } 130 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
130 131
132 LocaleNotificationController* locale_notification_controller() {
133 return locale_notification_controller_.get();
134 }
135
131 MaximizeModeController* maximize_mode_controller() { 136 MaximizeModeController* maximize_mode_controller() {
132 return maximize_mode_controller_.get(); 137 return maximize_mode_controller_.get();
133 } 138 }
134 139
135 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); } 140 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
136 141
137 MediaDelegate* media_delegate() { return media_delegate_.get(); } 142 MediaDelegate* media_delegate() { return media_delegate_.get(); }
138 143
139 NewWindowDelegate* new_window_delegate() { 144 NewWindowDelegate* new_window_delegate() {
140 return new_window_delegate_.get(); 145 return new_window_delegate_.get();
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 std::unique_ptr<ShellDelegate> delegate_; 470 std::unique_ptr<ShellDelegate> delegate_;
466 471
467 std::unique_ptr<AcceleratorController> accelerator_controller_; 472 std::unique_ptr<AcceleratorController> accelerator_controller_;
468 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 473 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
469 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; 474 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
470 std::unique_ptr<FocusCycler> focus_cycler_; 475 std::unique_ptr<FocusCycler> focus_cycler_;
471 std::unique_ptr<ImmersiveContextAsh> immersive_context_; 476 std::unique_ptr<ImmersiveContextAsh> immersive_context_;
472 std::unique_ptr<KeyboardBrightnessControlDelegate> 477 std::unique_ptr<KeyboardBrightnessControlDelegate>
473 keyboard_brightness_control_delegate_; 478 keyboard_brightness_control_delegate_;
474 std::unique_ptr<KeyboardUI> keyboard_ui_; 479 std::unique_ptr<KeyboardUI> keyboard_ui_;
480 std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
475 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 481 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
476 std::unique_ptr<MediaDelegate> media_delegate_; 482 std::unique_ptr<MediaDelegate> media_delegate_;
477 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 483 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
478 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 484 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
479 std::unique_ptr<PaletteDelegate> palette_delegate_; 485 std::unique_ptr<PaletteDelegate> palette_delegate_;
480 std::unique_ptr<ShelfController> shelf_controller_; 486 std::unique_ptr<ShelfController> shelf_controller_;
481 std::unique_ptr<ShelfDelegate> shelf_delegate_; 487 std::unique_ptr<ShelfDelegate> shelf_delegate_;
482 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 488 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
483 std::unique_ptr<SystemTrayController> system_tray_controller_; 489 std::unique_ptr<SystemTrayController> system_tray_controller_;
484 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 490 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
(...skipping 15 matching lines...) Expand all
500 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 506 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
501 507
502 #if defined(OS_CHROMEOS) 508 #if defined(OS_CHROMEOS)
503 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 509 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
504 #endif 510 #endif
505 }; 511 };
506 512
507 } // namespace ash 513 } // namespace ash
508 514
509 #endif // ASH_COMMON_WM_SHELL_H_ 515 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_notifier.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698