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

Unified Diff: ash/common/wm_shell.h

Issue 2420753002: ash: Use mojo LocaleNotificationController interface. (Closed)
Patch Set: Remove dead code + cl lint 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 side-by-side diff with in-line comments
Download patch
Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index c6d79223af4be922fcb710e55588198f06ec9d36..bb387eba633c09d321c5ef918ebf9d291d38e6d2 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -14,6 +14,7 @@
#include "ash/common/media_delegate.h"
#include "ash/common/metrics/gesture_action_type.h"
#include "ash/common/metrics/user_metrics_action.h"
+#include "ash/common/system/locale/locale_notification_controller.h"
msw 2016/10/14 01:46:29 nit: use a fwd decl instead
#include "ash/common/wm/lock_state_observer.h"
#include "base/observer_list.h"
#include "ui/base/ui_base_types.h"
@@ -128,6 +129,10 @@ class ASH_EXPORT WmShell {
KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
+ LocaleNotificationController* locale_notification_controller() {
+ return locale_notification_controller_.get();
+ }
+
MaximizeModeController* maximize_mode_controller() {
return maximize_mode_controller_.get();
}
@@ -469,6 +474,7 @@ class ASH_EXPORT WmShell {
std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
std::unique_ptr<FocusCycler> focus_cycler_;
std::unique_ptr<ImmersiveContextAsh> immersive_context_;
+ std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
msw 2016/10/14 01:46:29 nit: abc order (after KeyboardUI)
std::unique_ptr<KeyboardBrightnessControlDelegate>
keyboard_brightness_control_delegate_;
std::unique_ptr<KeyboardUI> keyboard_ui_;

Powered by Google App Engine
This is Rietveld 408576698