| OLD | NEW |
| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 info.tray_icon_visible = ShouldShowNetworkIconInTray(network); | 96 info.tray_icon_visible = ShouldShowNetworkIconInTray(network); |
| 97 return info; | 97 return info; |
| 98 } | 98 } |
| 99 | 99 |
| 100 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime, | 100 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime, |
| 101 const input_method::InputMethodUtil& util, | 101 const input_method::InputMethodUtil& util, |
| 102 ash::IMEInfo* info) { | 102 ash::IMEInfo* info) { |
| 103 info->id = ime.id(); | 103 info->id = ime.id(); |
| 104 info->name = util.GetInputMethodLongName(ime); | 104 info->name = util.GetInputMethodLongName(ime); |
| 105 info->short_name = util.GetInputMethodShortName(ime); | 105 info->short_name = util.GetInputMethodShortName(ime); |
| 106 info->third_party = ime.third_party(); |
| 106 } | 107 } |
| 107 | 108 |
| 108 ash::DriveOperationStatusList GetDriveStatusList( | 109 ash::DriveOperationStatusList GetDriveStatusList( |
| 109 const std::vector<GDataOperationRegistry::ProgressStatus>& list) { | 110 const std::vector<GDataOperationRegistry::ProgressStatus>& list) { |
| 110 ash::DriveOperationStatusList results; | 111 ash::DriveOperationStatusList results; |
| 111 for (GDataOperationRegistry::ProgressStatusList::const_iterator it = | 112 for (GDataOperationRegistry::ProgressStatusList::const_iterator it = |
| 112 list.begin(); | 113 list.begin(); |
| 113 it != list.end(); ++it) { | 114 it != list.end(); ++it) { |
| 114 ash::DriveOperationStatus status; | 115 ash::DriveOperationStatus status; |
| 115 status.file_path = it->file_path; | 116 status.file_path = it->file_path; |
| (...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1224 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1225 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
| 1225 }; | 1226 }; |
| 1226 | 1227 |
| 1227 } // namespace | 1228 } // namespace |
| 1228 | 1229 |
| 1229 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { | 1230 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { |
| 1230 return new chromeos::SystemTrayDelegate(tray); | 1231 return new chromeos::SystemTrayDelegate(tray); |
| 1231 } | 1232 } |
| 1232 | 1233 |
| 1233 } // namespace chromeos | 1234 } // namespace chromeos |
| OLD | NEW |