| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 kDisplayOverscanSettingsSubPageName)); | 509 kDisplayOverscanSettingsSubPageName)); |
| 510 } | 510 } |
| 511 | 511 |
| 512 void SystemTrayDelegateChromeOS::ShowIMESettings() { | 512 void SystemTrayDelegateChromeOS::ShowIMESettings() { |
| 513 content::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog")); | 513 content::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog")); |
| 514 ShowSettingsSubPageForActiveUser(chrome::kLanguageOptionsSubPage); | 514 ShowSettingsSubPageForActiveUser(chrome::kLanguageOptionsSubPage); |
| 515 } | 515 } |
| 516 | 516 |
| 517 void SystemTrayDelegateChromeOS::ShowHelp() { | 517 void SystemTrayDelegateChromeOS::ShowHelp() { |
| 518 chrome::ShowHelpForProfile(ProfileManager::GetActiveUserProfile(), | 518 chrome::ShowHelpForProfile(ProfileManager::GetActiveUserProfile(), |
| 519 chrome::HOST_DESKTOP_TYPE_ASH, |
| 519 chrome::HELP_SOURCE_MENU); | 520 chrome::HELP_SOURCE_MENU); |
| 520 } | 521 } |
| 521 | 522 |
| 522 void SystemTrayDelegateChromeOS::ShowAccessibilityHelp() { | 523 void SystemTrayDelegateChromeOS::ShowAccessibilityHelp() { |
| 523 chrome::ScopedTabbedBrowserDisplayer displayer( | 524 chrome::ScopedTabbedBrowserDisplayer displayer( |
| 524 ProfileManager::GetActiveUserProfile()); | 525 ProfileManager::GetActiveUserProfile()); |
| 525 accessibility::ShowAccessibilityHelp(displayer.browser()); | 526 accessibility::ShowAccessibilityHelp(displayer.browser()); |
| 526 } | 527 } |
| 527 | 528 |
| 528 void SystemTrayDelegateChromeOS::ShowAccessibilitySettings() { | 529 void SystemTrayDelegateChromeOS::ShowAccessibilitySettings() { |
| (...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1326 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1327 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
| 1327 << "ENABLE_SUPERVISED_USERS undefined."; | 1328 << "ENABLE_SUPERVISED_USERS undefined."; |
| 1328 return base::string16(); | 1329 return base::string16(); |
| 1329 } | 1330 } |
| 1330 | 1331 |
| 1331 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1332 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1332 return new SystemTrayDelegateChromeOS(); | 1333 return new SystemTrayDelegateChromeOS(); |
| 1333 } | 1334 } |
| 1334 | 1335 |
| 1335 } // namespace chromeos | 1336 } // namespace chromeos |
| OLD | NEW |