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

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: Rebase w/ icons in tot 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
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | chrome/browser/chromeos/locale_change_guard.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index ca353120d2ba97223b991d70021ff758ed0a0482..335c770f2db154b95abf31b533d1e566ad4093f6 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -13,6 +13,7 @@
#include "ash/system/date/tray_date.h"
#include "ash/system/drive/tray_drive.h"
#include "ash/system/ime/tray_ime.h"
+#include "ash/system/locale/tray_locale.h"
#include "ash/system/network/tray_network.h"
#include "ash/system/network/tray_sms.h"
#include "ash/system/power/power_status_observer.h"
@@ -162,6 +163,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),
@@ -214,6 +216,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;
@@ -224,6 +227,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;
@@ -236,6 +240,7 @@ void SystemTray::CreateItems() {
AddTrayItem(tray_sms);
AddTrayItem(tray_drive);
AddTrayItem(tray_ime);
+ AddTrayItem(tray_locale);
AddTrayItem(tray_volume);
AddTrayItem(tray_brightness);
AddTrayItem(tray_update);
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | chrome/browser/chromeos/locale_change_guard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698