Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/webui/options/manage_profile_handler.h" | 5 #include "chrome/browser/ui/webui/options/manage_profile_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/prefs/scoped_user_pref_update.h" | 10 #include "base/prefs/scoped_user_pref_update.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 | 124 |
| 125 base::string16 supervised_user_dashboard_url = | 125 base::string16 supervised_user_dashboard_url = |
| 126 base::ASCIIToUTF16(chrome::kLegacySupervisedUserManagementURL); | 126 base::ASCIIToUTF16(chrome::kLegacySupervisedUserManagementURL); |
| 127 base::string16 supervised_user_dashboard_display = | 127 base::string16 supervised_user_dashboard_display = |
| 128 base::ASCIIToUTF16(chrome::kLegacySupervisedUserManagementDisplayURL); | 128 base::ASCIIToUTF16(chrome::kLegacySupervisedUserManagementDisplayURL); |
| 129 localized_strings->SetString("deleteSupervisedProfileAddendum", | 129 localized_strings->SetString("deleteSupervisedProfileAddendum", |
| 130 l10n_util::GetStringFUTF16(IDS_PROFILES_DELETE_LEGACY_SUPERVISED_ADDENDUM, | 130 l10n_util::GetStringFUTF16(IDS_PROFILES_DELETE_LEGACY_SUPERVISED_ADDENDUM, |
| 131 supervised_user_dashboard_url, | 131 supervised_user_dashboard_url, |
| 132 supervised_user_dashboard_display)); | 132 supervised_user_dashboard_display)); |
| 133 | 133 |
| 134 localized_strings->SetBoolean("newAvatarMenuEnabled", | |
|
Mike Lerman
2015/09/28 15:23:01
What about ChromeOS?
anthonyvd
2015/09/29 20:23:16
For context, you can take a look at the comments i
| |
| 135 switches::IsNewAvatarMenu()); | |
| 136 localized_strings->SetBoolean("profileShortcutsEnabled", | 134 localized_strings->SetBoolean("profileShortcutsEnabled", |
| 137 ProfileShortcutManager::IsFeatureEnabled()); | 135 ProfileShortcutManager::IsFeatureEnabled()); |
| 138 | 136 |
| 139 GenerateSignedinUserSpecificStrings(localized_strings); | 137 GenerateSignedinUserSpecificStrings(localized_strings); |
| 140 } | 138 } |
| 141 | 139 |
| 142 void ManageProfileHandler::InitializeHandler() { | 140 void ManageProfileHandler::InitializeHandler() { |
| 143 g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this); | 141 g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this); |
| 144 | 142 |
| 145 Profile* profile = Profile::FromWebUI(web_ui()); | 143 Profile* profile = Profile::FromWebUI(web_ui()); |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 563 | 561 |
| 564 // Update the UI buttons. | 562 // Update the UI buttons. |
| 565 OnHasProfileShortcuts(false); | 563 OnHasProfileShortcuts(false); |
| 566 } | 564 } |
| 567 | 565 |
| 568 void ManageProfileHandler::RefreshGaiaPicture(const base::ListValue* args) { | 566 void ManageProfileHandler::RefreshGaiaPicture(const base::ListValue* args) { |
| 569 profiles::UpdateGaiaProfileInfoIfNeeded(Profile::FromWebUI(web_ui())); | 567 profiles::UpdateGaiaProfileInfoIfNeeded(Profile::FromWebUI(web_ui())); |
| 570 } | 568 } |
| 571 | 569 |
| 572 } // namespace options | 570 } // namespace options |
| OLD | NEW |