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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 10960060: fix "IME changed" notification uses a wrong field of IME (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: resource ids; more cases Created 8 years, 3 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 | « chrome/browser/chromeos/input_method/input_method_util_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/system/audio/audio_observer.h" 9 #include "ash/system/audio/audio_observer.h"
10 #include "ash/system/bluetooth/bluetooth_observer.h" 10 #include "ash/system/bluetooth/bluetooth_observer.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 info.service_path = network->service_path(); 94 info.service_path = network->service_path();
95 info.highlight = network->connected() || network->connecting(); 95 info.highlight = network->connected() || network->connecting();
96 return info; 96 return info;
97 } 97 }
98 98
99 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime, 99 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime,
100 const input_method::InputMethodUtil& util, 100 const input_method::InputMethodUtil& util,
101 ash::IMEInfo* info) { 101 ash::IMEInfo* info) {
102 info->id = ime.id(); 102 info->id = ime.id();
103 info->name = util.GetInputMethodLongName(ime); 103 info->name = util.GetInputMethodLongName(ime);
104 info->medium_name = util.GetInputMethodMediumName(ime);
104 info->short_name = util.GetInputMethodShortName(ime); 105 info->short_name = util.GetInputMethodShortName(ime);
105 info->third_party = ime.third_party(); 106 info->third_party = ime.third_party();
106 } 107 }
107 108
108 ash::DriveOperationStatusList GetDriveStatusList( 109 ash::DriveOperationStatusList GetDriveStatusList(
109 const gdata::OperationProgressStatusList& list) { 110 const gdata::OperationProgressStatusList& list) {
110 ash::DriveOperationStatusList results; 111 ash::DriveOperationStatusList results;
111 for (gdata::OperationProgressStatusList::const_iterator it = list.begin(); 112 for (gdata::OperationProgressStatusList::const_iterator it = list.begin();
112 it != list.end(); ++it) { 113 it != list.end(); ++it) {
113 ash::DriveOperationStatus status; 114 ash::DriveOperationStatus status;
(...skipping 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1258 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1259 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1259 }; 1260 };
1260 1261
1261 } // namespace 1262 } // namespace
1262 1263
1263 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 1264 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
1264 return new chromeos::SystemTrayDelegate(tray); 1265 return new chromeos::SystemTrayDelegate(tray);
1265 } 1266 }
1266 1267
1267 } // namespace chromeos 1268 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_util_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698