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

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

Issue 834673005: chrome://settings should allow duplicate profile names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix browser test Created 5 years, 11 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
« 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 if (service) 77 if (service)
78 service->RemoveObserver(this); 78 service->RemoveObserver(this);
79 } 79 }
80 80
81 void ManageProfileHandler::GetLocalizedValues( 81 void ManageProfileHandler::GetLocalizedValues(
82 base::DictionaryValue* localized_strings) { 82 base::DictionaryValue* localized_strings) {
83 DCHECK(localized_strings); 83 DCHECK(localized_strings);
84 84
85 static OptionsStringResource resources[] = { 85 static OptionsStringResource resources[] = {
86 { "manageProfilesNameLabel", IDS_PROFILES_MANAGE_NAME_LABEL }, 86 { "manageProfilesNameLabel", IDS_PROFILES_MANAGE_NAME_LABEL },
87 { "manageProfilesDuplicateNameError",
88 IDS_PROFILES_MANAGE_DUPLICATE_NAME_ERROR },
89 { "manageProfilesIconLabel", IDS_PROFILES_MANAGE_ICON_LABEL }, 87 { "manageProfilesIconLabel", IDS_PROFILES_MANAGE_ICON_LABEL },
90 { "manageProfilesExistingSupervisedUser", 88 { "manageProfilesExistingSupervisedUser",
91 IDS_PROFILES_CREATE_EXISTING_SUPERVISED_USER_ERROR }, 89 IDS_PROFILES_CREATE_EXISTING_SUPERVISED_USER_ERROR },
92 { "manageProfilesSupervisedSignedInLabel", 90 { "manageProfilesSupervisedSignedInLabel",
93 IDS_PROFILES_CREATE_SUPERVISED_SIGNED_IN_LABEL }, 91 IDS_PROFILES_CREATE_SUPERVISED_SIGNED_IN_LABEL },
94 { "manageProfilesSupervisedNotSignedIn", 92 { "manageProfilesSupervisedNotSignedIn",
95 IDS_PROFILES_CREATE_SUPERVISED_NOT_SIGNED_IN_HTML }, 93 IDS_PROFILES_CREATE_SUPERVISED_NOT_SIGNED_IN_HTML },
96 { "manageProfilesSupervisedAccountDetailsOutOfDate", 94 { "manageProfilesSupervisedAccountDetailsOutOfDate",
97 IDS_PROFILES_CREATE_SUPERVISED_ACCOUNT_DETAILS_OUT_OF_DATE_LABEL }, 95 IDS_PROFILES_CREATE_SUPERVISED_ACCOUNT_DETAILS_OUT_OF_DATE_LABEL },
98 { "manageProfilesSupervisedSignInAgainLink", 96 { "manageProfilesSupervisedSignInAgainLink",
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 531
534 // Update the UI buttons. 532 // Update the UI buttons.
535 OnHasProfileShortcuts(false); 533 OnHasProfileShortcuts(false);
536 } 534 }
537 535
538 void ManageProfileHandler::RefreshGaiaPicture(const base::ListValue* args) { 536 void ManageProfileHandler::RefreshGaiaPicture(const base::ListValue* args) {
539 profiles::UpdateGaiaProfileInfoIfNeeded(Profile::FromWebUI(web_ui())); 537 profiles::UpdateGaiaProfileInfoIfNeeded(Profile::FromWebUI(web_ui()));
540 } 538 }
541 539
542 } // namespace options 540 } // 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