diff options
| author | michaelpg@chromium.org <michaelpg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 07:42:43 +0000 |
|---|---|---|
| committer | michaelpg@chromium.org <michaelpg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 07:42:43 +0000 |
| commit | 68fbc918b7cf3ea40ab0e0408d8bfa6bda32cf27 (patch) | |
| tree | 55ad299b92685cb1ab4949377297dc4001bbd582 | |
| parent | fec787bf15b93808bd362190be2805ed2395781f (diff) | |
| download | chromium_src-68fbc918b7cf3ea40ab0e0408d8bfa6bda32cf27.zip chromium_src-68fbc918b7cf3ea40ab0e0408d8bfa6bda32cf27.tar.gz chromium_src-68fbc918b7cf3ea40ab0e0408d8bfa6bda32cf27.tar.bz2 | |
Show settings for active user only, in CrOS tray menu delegate
BUG=356397
R=derat@chromium.org
Chrome OS tests passed, windows compile failing.
NOTRY=true
Review URL: https://codereview.chromium.org/199323007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259528 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc index d3fc1aa..f39af56 100644 --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc @@ -224,16 +224,11 @@ void ShowSettingsSubPageForActiveUser(const std::string& sub_page) { ProfileManager::GetActiveUserProfile(), sub_page); } -void ShowSettingsSubPageForPrimaryUser(const std::string& sub_page) { - chrome::ShowSettingsSubPageForProfile( - ProfileManager::GetPrimaryUserProfile(), sub_page); -} - void ShowNetworkSettingsPage(const std::string& service_path) { std::string page = chrome::kInternetOptionsSubPage; page += "?servicePath=" + net::EscapeUrlEncodedData(service_path, true); content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog")); - ShowSettingsSubPageForPrimaryUser(page); + ShowSettingsSubPageForActiveUser(page); } void OnAcceptMultiprofilesIntro(bool no_show_again) { @@ -833,7 +828,7 @@ void SystemTrayDelegateChromeOS::ManageBluetoothDevices() { std::string sub_page = std::string(chrome::kSearchSubPage) + "#" + l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH); - ShowSettingsSubPageForPrimaryUser(sub_page); + ShowSettingsSubPageForActiveUser(sub_page); } void SystemTrayDelegateChromeOS::ToggleBluetooth() { |