summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-31 06:22:56 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-31 06:22:56 +0000
commita9a40461f5cb4c62f21d2a693effa8916fa723ad (patch)
tree5465be804ce9f5a8a657ae8cc30943e918e41e0f /ash/shell.h
parent13877ef9972916ef05091e296c2a5b558bb10e70 (diff)
downloadchromium_src-a9a40461f5cb4c62f21d2a693effa8916fa723ad.zip
chromium_src-a9a40461f5cb4c62f21d2a693effa8916fa723ad.tar.gz
chromium_src-a9a40461f5cb4c62f21d2a693effa8916fa723ad.tar.bz2
Migrates locale notification from system tray to the message center.
BUG=259136 R=stevenjb@chromium.org Review URL: https://chromiumcodereview.appspot.com/19716003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/shell.h b/ash/shell.h
index 69b8970e..7f31c8d 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -111,6 +111,7 @@ class EventClientImpl;
class EventRewriterEventFilter;
class EventTransformationHandler;
class FocusCycler;
+class LocaleNotificationController;
class MouseCursorEventFilter;
class OutputConfiguratorAnimation;
class OverlayEventFilter;
@@ -583,6 +584,9 @@ class ASH_EXPORT Shell
scoped_ptr<internal::DisplayManager> display_manager_;
+ scoped_ptr<internal::LocaleNotificationController>
+ locale_notification_controller_;
+
#if defined(OS_CHROMEOS) && defined(USE_X11)
// Controls video output device state.
scoped_ptr<chromeos::OutputConfigurator> output_configurator_;