Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Side by Side Diff: chrome/browser/ui/webui/options/manage_profile_handler.cc

Issue 445003002: Supervised users: UI updates for new-profile-management launch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/options/manage_profile_browsertest.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 static OptionsStringResource resources[] = { 83 static OptionsStringResource resources[] = {
84 { "manageProfilesNameLabel", IDS_PROFILES_MANAGE_NAME_LABEL }, 84 { "manageProfilesNameLabel", IDS_PROFILES_MANAGE_NAME_LABEL },
85 { "manageProfilesDuplicateNameError", 85 { "manageProfilesDuplicateNameError",
86 IDS_PROFILES_MANAGE_DUPLICATE_NAME_ERROR }, 86 IDS_PROFILES_MANAGE_DUPLICATE_NAME_ERROR },
87 { "manageProfilesIconLabel", IDS_PROFILES_MANAGE_ICON_LABEL }, 87 { "manageProfilesIconLabel", IDS_PROFILES_MANAGE_ICON_LABEL },
88 { "manageProfilesExistingSupervisedUser", 88 { "manageProfilesExistingSupervisedUser",
89 IDS_PROFILES_CREATE_EXISTING_SUPERVISED_USER_ERROR }, 89 IDS_PROFILES_CREATE_EXISTING_SUPERVISED_USER_ERROR },
90 { "manageProfilesSupervisedSignedInLabel", 90 { "manageProfilesSupervisedSignedInLabel",
91 IDS_PROFILES_CREATE_SUPERVISED_SIGNED_IN_LABEL }, 91 IDS_PROFILES_CREATE_SUPERVISED_SIGNED_IN_LABEL },
92 { "manageProfilesSupervisedNotSignedInLabel", 92 { "manageProfilesSupervisedNotSignedIn",
93 IDS_PROFILES_CREATE_SUPERVISED_NOT_SIGNED_IN_LABEL }, 93 IDS_PROFILES_CREATE_SUPERVISED_NOT_SIGNED_IN_HTML },
94 { "manageProfilesSupervisedAccountDetailsOutOfDate", 94 { "manageProfilesSupervisedAccountDetailsOutOfDate",
95 IDS_PROFILES_CREATE_SUPERVISED_ACCOUNT_DETAILS_OUT_OF_DATE_LABEL }, 95 IDS_PROFILES_CREATE_SUPERVISED_ACCOUNT_DETAILS_OUT_OF_DATE_LABEL },
96 { "manageProfilesSupervisedSignInAgainLink", 96 { "manageProfilesSupervisedSignInAgainLink",
97 IDS_PROFILES_CREATE_SUPERVISED_SIGN_IN_AGAIN_LINK }, 97 IDS_PROFILES_CREATE_SUPERVISED_SIGN_IN_AGAIN_LINK },
98 { "manageProfilesSupervisedNotSignedInLink",
99 IDS_PROFILES_CREATE_SUPERVISED_NOT_SIGNED_IN_LINK },
100 { "deleteProfileTitle", IDS_PROFILES_DELETE_TITLE }, 98 { "deleteProfileTitle", IDS_PROFILES_DELETE_TITLE },
101 { "deleteProfileOK", IDS_PROFILES_DELETE_OK_BUTTON_LABEL }, 99 { "deleteProfileOK", IDS_PROFILES_DELETE_OK_BUTTON_LABEL },
102 { "deleteProfileMessage", IDS_PROFILES_DELETE_MESSAGE }, 100 { "deleteProfileMessage", IDS_PROFILES_DELETE_MESSAGE },
103 { "deleteSupervisedProfileAddendum", 101 { "deleteSupervisedProfileAddendum",
104 IDS_PROFILES_DELETE_SUPERVISED_ADDENDUM }, 102 IDS_PROFILES_DELETE_SUPERVISED_ADDENDUM },
105 { "disconnectManagedProfileTitle", 103 { "disconnectManagedProfileTitle",
106 IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TITLE }, 104 IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TITLE },
107 { "disconnectManagedProfileOK", 105 { "disconnectManagedProfileOK",
108 IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_OK_BUTTON_LABEL }, 106 IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_OK_BUTTON_LABEL },
109 { "createProfileTitle", IDS_PROFILES_CREATE_TITLE }, 107 { "createProfileTitle", IDS_PROFILES_CREATE_TITLE },
110 { "createProfileInstructions", IDS_PROFILES_CREATE_INSTRUCTIONS }, 108 { "createProfileInstructions", IDS_PROFILES_CREATE_INSTRUCTIONS },
111 { "createProfileConfirm", IDS_PROFILES_CREATE_CONFIRM }, 109 { "createProfileConfirm", IDS_PROFILES_CREATE_CONFIRM },
112 { "createProfileShortcutCheckbox", IDS_PROFILES_CREATE_SHORTCUT_CHECKBOX }, 110 { "createProfileShortcutCheckbox", IDS_PROFILES_CREATE_SHORTCUT_CHECKBOX },
113 { "createProfileShortcutButton", IDS_PROFILES_CREATE_SHORTCUT_BUTTON }, 111 { "createProfileShortcutButton", IDS_PROFILES_CREATE_SHORTCUT_BUTTON },
114 { "removeProfileShortcutButton", IDS_PROFILES_REMOVE_SHORTCUT_BUTTON }, 112 { "removeProfileShortcutButton", IDS_PROFILES_REMOVE_SHORTCUT_BUTTON },
115 { "importExistingSupervisedUserLink", 113 { "importExistingSupervisedUserLink",
116 IDS_PROFILES_IMPORT_EXISTING_SUPERVISED_USER_LINK }, 114 IDS_PROFILES_IMPORT_EXISTING_SUPERVISED_USER_LINK },
117 { "signInToImportSupervisedUsers",
118 IDS_PROFILES_IMPORT_SUPERVISED_USER_NOT_SIGNED_IN },
119 }; 115 };
120 116
121 RegisterStrings(localized_strings, resources, arraysize(resources)); 117 RegisterStrings(localized_strings, resources, arraysize(resources));
122 RegisterTitle(localized_strings, "manageProfile", 118 RegisterTitle(localized_strings, "manageProfile",
123 IDS_PROFILES_MANAGE_TITLE); 119 IDS_PROFILES_MANAGE_TITLE);
124 RegisterTitle(localized_strings, "createProfile", 120 RegisterTitle(localized_strings, "createProfile",
125 IDS_PROFILES_CREATE_TITLE); 121 IDS_PROFILES_CREATE_TITLE);
126 122
127 localized_strings->SetBoolean("profileShortcutsEnabled", 123 localized_strings->SetBoolean("profileShortcutsEnabled",
128 ProfileShortcutManager::IsFeatureEnabled()); 124 ProfileShortcutManager::IsFeatureEnabled());
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 525
530 // Update the UI buttons. 526 // Update the UI buttons.
531 OnHasProfileShortcuts(false); 527 OnHasProfileShortcuts(false);
532 } 528 }
533 529
534 void ManageProfileHandler::RefreshGaiaPicture(const base::ListValue* args) { 530 void ManageProfileHandler::RefreshGaiaPicture(const base::ListValue* args) {
535 profiles::UpdateGaiaProfilePhotoIfNeeded(Profile::FromWebUI(web_ui())); 531 profiles::UpdateGaiaProfilePhotoIfNeeded(Profile::FromWebUI(web_ui()));
536 } 532 }
537 533
538 } // namespace options 534 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/manage_profile_browsertest.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698