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

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

Issue 125993002: Add error handling for supervised user import flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update ManagedDelete test. Created 6 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 | Annotate | Revision Log
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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 void ManageProfileHandler::GetLocalizedValues( 78 void ManageProfileHandler::GetLocalizedValues(
79 base::DictionaryValue* localized_strings) { 79 base::DictionaryValue* localized_strings) {
80 DCHECK(localized_strings); 80 DCHECK(localized_strings);
81 81
82 static OptionsStringResource resources[] = { 82 static OptionsStringResource resources[] = {
83 { "manageProfilesNameLabel", IDS_PROFILES_MANAGE_NAME_LABEL }, 83 { "manageProfilesNameLabel", IDS_PROFILES_MANAGE_NAME_LABEL },
84 { "manageProfilesDuplicateNameError", 84 { "manageProfilesDuplicateNameError",
85 IDS_PROFILES_MANAGE_DUPLICATE_NAME_ERROR }, 85 IDS_PROFILES_MANAGE_DUPLICATE_NAME_ERROR },
86 { "manageProfilesIconLabel", IDS_PROFILES_MANAGE_ICON_LABEL }, 86 { "manageProfilesIconLabel", IDS_PROFILES_MANAGE_ICON_LABEL },
87 { "manageProfilesExistingSupervisedUser",
88 IDS_PROFILES_CREATE_EXISTING_MANAGED_USER_ERROR },
87 { "manageProfilesManagedSignedInLabel", 89 { "manageProfilesManagedSignedInLabel",
88 IDS_PROFILES_CREATE_MANAGED_SIGNED_IN_LABEL }, 90 IDS_PROFILES_CREATE_MANAGED_SIGNED_IN_LABEL },
89 { "manageProfilesManagedNotSignedInLabel", 91 { "manageProfilesManagedNotSignedInLabel",
90 IDS_PROFILES_CREATE_MANAGED_NOT_SIGNED_IN_LABEL }, 92 IDS_PROFILES_CREATE_MANAGED_NOT_SIGNED_IN_LABEL },
91 { "manageProfilesManagedAccountDetailsOutOfDate", 93 { "manageProfilesManagedAccountDetailsOutOfDate",
92 IDS_PROFILES_CREATE_MANAGED_ACCOUNT_DETAILS_OUT_OF_DATE_LABEL }, 94 IDS_PROFILES_CREATE_MANAGED_ACCOUNT_DETAILS_OUT_OF_DATE_LABEL },
93 { "manageProfilesManagedSignInAgainLink", 95 { "manageProfilesManagedSignInAgainLink",
94 IDS_PROFILES_CREATE_MANAGED_ACCOUNT_SIGN_IN_AGAIN_LINK }, 96 IDS_PROFILES_CREATE_MANAGED_ACCOUNT_SIGN_IN_AGAIN_LINK },
95 { "manageProfilesManagedNotSignedInLink", 97 { "manageProfilesManagedNotSignedInLink",
96 IDS_PROFILES_CREATE_MANAGED_NOT_SIGNED_IN_LINK }, 98 IDS_PROFILES_CREATE_MANAGED_NOT_SIGNED_IN_LINK },
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 g_browser_process->profile_manager()->profile_shortcut_manager(); 465 g_browser_process->profile_manager()->profile_shortcut_manager();
464 DCHECK(shortcut_manager); 466 DCHECK(shortcut_manager);
465 467
466 shortcut_manager->RemoveProfileShortcuts(profile_file_path); 468 shortcut_manager->RemoveProfileShortcuts(profile_file_path);
467 469
468 // Update the UI buttons. 470 // Update the UI buttons.
469 OnHasProfileShortcuts(false); 471 OnHasProfileShortcuts(false);
470 } 472 }
471 473
472 } // namespace options 474 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698