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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
379 NOTREACHED(); | 379 NOTREACHED(); |
380 return ash::user::LOGGED_IN_NONE; | 380 return ash::user::LOGGED_IN_NONE; |
381 } | 381 } |
382 | 382 |
383 void SystemTrayDelegateChromeOS::ChangeProfilePicture() { | 383 void SystemTrayDelegateChromeOS::ChangeProfilePicture() { |
384 content::RecordAction( | 384 content::RecordAction( |
385 base::UserMetricsAction("OpenChangeProfilePictureDialog")); | 385 base::UserMetricsAction("OpenChangeProfilePictureDialog")); |
386 ShowSettingsSubPageForActiveUser(chrome::kChangeProfilePictureSubPage); | 386 ShowSettingsSubPageForActiveUser(chrome::kChangeProfilePictureSubPage); |
387 } | 387 } |
388 | 388 |
389 const std::string SystemTrayDelegateChromeOS::GetEnterpriseDomain() const { | 389 const std::string& SystemTrayDelegateChromeOS::GetEnterpriseDomain() const { |
390 return enterprise_domain_; | 390 return enterprise_domain_; |
391 } | 391 } |
392 | 392 |
393 const base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const { | 393 const base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const { |
394 if (GetEnterpriseDomain().empty()) | 394 if (GetEnterpriseDomain().empty()) |
395 return base::string16(); | 395 return base::string16(); |
396 return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE, | 396 return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE, |
397 base::UTF8ToUTF16(GetEnterpriseDomain())); | 397 base::UTF8ToUTF16(GetEnterpriseDomain())); |
398 } | 398 } |
399 | 399 |
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1417 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1417 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
1418 << "ENABLE_SUPERVISED_USERS undefined."; | 1418 << "ENABLE_SUPERVISED_USERS undefined."; |
1419 return base::string16(); | 1419 return base::string16(); |
1420 } | 1420 } |
1421 | 1421 |
1422 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1422 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
1423 return new SystemTrayDelegateChromeOS(); | 1423 return new SystemTrayDelegateChromeOS(); |
1424 } | 1424 } |
1425 | 1425 |
1426 } // namespace chromeos | 1426 } // namespace chromeos |
OLD | NEW |