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

Unified Diff: ash/system/tray/system_tray.cc

Issue 10391177: Add TrayLocale for locale change notifications. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 99113877940e6d3bc69b85922abe487b6f55ce1f..08a2a79ec3851add94bbf29573c859f2c2a09b2d 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -25,6 +25,7 @@
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray_accessibility.h"
#include "ash/system/tray_caps_lock.h"
+#include "ash/system/tray_locale.h"
#include "ash/system/tray_update.h"
#include "ash/system/user/login_status.h"
#include "ash/system/user/tray_user.h"
@@ -161,6 +162,7 @@ SystemTray::SystemTray()
clock_observer_(NULL),
drive_observer_(NULL),
ime_observer_(NULL),
+ locale_observer_(NULL),
network_observer_(NULL),
power_status_observer_(NULL),
update_observer_(NULL),
@@ -212,6 +214,7 @@ void SystemTray::CreateItems() {
internal::TrayCapsLock* tray_caps_lock = new internal::TrayCapsLock;
internal::TrayDrive* tray_drive = new internal::TrayDrive;
internal::TrayIME* tray_ime = new internal::TrayIME;
+ internal::TrayLocale* tray_locale = new internal::TrayLocale;
internal::TrayUpdate* tray_update = new internal::TrayUpdate;
accessibility_observer_ = tray_accessibility;
@@ -222,6 +225,7 @@ void SystemTray::CreateItems() {
clock_observer_ = tray_date;
drive_observer_ = tray_drive;
ime_observer_ = tray_ime;
+ locale_observer_ = tray_locale;
network_observer_ = tray_network;
power_status_observer_ = tray_power;
update_observer_ = tray_update;
@@ -233,6 +237,7 @@ void SystemTray::CreateItems() {
AddTrayItem(tray_bluetooth);
AddTrayItem(tray_drive);
AddTrayItem(tray_ime);
+ AddTrayItem(tray_locale);
AddTrayItem(tray_volume);
AddTrayItem(tray_brightness);
AddTrayItem(tray_update);

Powered by Google App Engine
This is Rietveld 408576698