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

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

Issue 10544070: Add decoration to the language button to indicate that a third party IME is in use (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit tests Created 8 years, 6 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 | Annotate | Revision Log
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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 info.tray_icon_visible = ShouldShowNetworkIconInTray(network); 98 info.tray_icon_visible = ShouldShowNetworkIconInTray(network);
99 return info; 99 return info;
100 } 100 }
101 101
102 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime, 102 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime,
103 const input_method::InputMethodUtil& util, 103 const input_method::InputMethodUtil& util,
104 ash::IMEInfo* info) { 104 ash::IMEInfo* info) {
105 info->id = ime.id(); 105 info->id = ime.id();
106 info->name = util.GetInputMethodLongName(ime); 106 info->name = util.GetInputMethodLongName(ime);
107 info->short_name = util.GetInputMethodShortName(ime); 107 info->short_name = util.GetInputMethodShortName(ime);
108 info->third_party = ime.third_party();
108 } 109 }
109 110
110 ash::DriveOperationStatusList GetDriveStatusList( 111 ash::DriveOperationStatusList GetDriveStatusList(
111 const std::vector<GDataOperationRegistry::ProgressStatus>& list) { 112 const std::vector<GDataOperationRegistry::ProgressStatus>& list) {
112 ash::DriveOperationStatusList results; 113 ash::DriveOperationStatusList results;
113 for (GDataOperationRegistry::ProgressStatusList::const_iterator it = 114 for (GDataOperationRegistry::ProgressStatusList::const_iterator it =
114 list.begin(); 115 list.begin();
115 it != list.end(); ++it) { 116 it != list.end(); ++it) {
116 ash::DriveOperationStatus status; 117 ash::DriveOperationStatus status;
117 status.file_path = it->file_path; 118 status.file_path = it->file_path;
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1237 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1237 }; 1238 };
1238 1239
1239 } // namespace 1240 } // namespace
1240 1241
1241 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 1242 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
1242 return new chromeos::SystemTrayDelegate(tray); 1243 return new chromeos::SystemTrayDelegate(tray);
1243 } 1244 }
1244 1245
1245 } // namespace chromeos 1246 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698