| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ui/ash/system_tray_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 NOTREACHED(); | 355 NOTREACHED(); |
| 356 return ash::user::LOGGED_IN_NONE; | 356 return ash::user::LOGGED_IN_NONE; |
| 357 } | 357 } |
| 358 | 358 |
| 359 void SystemTrayDelegateChromeOS::ChangeProfilePicture() { | 359 void SystemTrayDelegateChromeOS::ChangeProfilePicture() { |
| 360 content::RecordAction( | 360 content::RecordAction( |
| 361 base::UserMetricsAction("OpenChangeProfilePictureDialog")); | 361 base::UserMetricsAction("OpenChangeProfilePictureDialog")); |
| 362 ShowSettingsSubPageForActiveUser(chrome::kChangeProfilePictureSubPage); | 362 ShowSettingsSubPageForActiveUser(chrome::kChangeProfilePictureSubPage); |
| 363 } | 363 } |
| 364 | 364 |
| 365 const std::string SystemTrayDelegateChromeOS::GetEnterpriseDomain() const { | 365 std::string SystemTrayDelegateChromeOS::GetEnterpriseDomain() const { |
| 366 return enterprise_domain_; | 366 return enterprise_domain_; |
| 367 } | 367 } |
| 368 | 368 |
| 369 const base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const { | 369 const base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const { |
| 370 if (GetEnterpriseDomain().empty()) | 370 if (GetEnterpriseDomain().empty()) |
| 371 return base::string16(); | 371 return base::string16(); |
| 372 return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE, | 372 return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE, |
| 373 base::UTF8ToUTF16(GetEnterpriseDomain())); | 373 base::UTF8ToUTF16(GetEnterpriseDomain())); |
| 374 } | 374 } |
| 375 | 375 |
| (...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1327 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1327 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
| 1328 << "ENABLE_SUPERVISED_USERS undefined."; | 1328 << "ENABLE_SUPERVISED_USERS undefined."; |
| 1329 return base::string16(); | 1329 return base::string16(); |
| 1330 } | 1330 } |
| 1331 | 1331 |
| 1332 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1332 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1333 return new SystemTrayDelegateChromeOS(); | 1333 return new SystemTrayDelegateChromeOS(); |
| 1334 } | 1334 } |
| 1335 | 1335 |
| 1336 } // namespace chromeos | 1336 } // namespace chromeos |
| OLD | NEW |