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

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

Issue 17320005: Update strings to match the final spec. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: For review Created 7 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/managed_user_create_confirm_handler.h" 5 #include "chrome/browser/ui/webui/options/managed_user_create_confirm_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/value_conversions.h" 9 #include "base/value_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/signin/signin_manager.h"
15 #include "chrome/browser/signin/signin_manager_base.h"
16 #include "chrome/browser/signin/signin_manager_factory.h"
14 #include "chrome/browser/ui/browser_finder.h" 17 #include "chrome/browser/ui/browser_finder.h"
15 #include "chrome/browser/ui/host_desktop.h" 18 #include "chrome/browser/ui/host_desktop.h"
16 #include "chrome/browser/ui/startup/startup_types.h" 19 #include "chrome/browser/ui/startup/startup_types.h"
17 #include "content/public/browser/web_ui.h" 20 #include "content/public/browser/web_ui.h"
18 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
19 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
20 23
21 namespace options { 24 namespace options {
22 25
23 ManagedUserCreateConfirmHandler::ManagedUserCreateConfirmHandler() { 26 ManagedUserCreateConfirmHandler::ManagedUserCreateConfirmHandler() {
24 } 27 }
25 28
26 ManagedUserCreateConfirmHandler::~ManagedUserCreateConfirmHandler() { 29 ManagedUserCreateConfirmHandler::~ManagedUserCreateConfirmHandler() {
27 } 30 }
28 31
29 void ManagedUserCreateConfirmHandler::GetLocalizedValues( 32 void ManagedUserCreateConfirmHandler::GetLocalizedValues(
30 base::DictionaryValue* localized_strings) { 33 base::DictionaryValue* localized_strings) {
31 DCHECK(localized_strings); 34 DCHECK(localized_strings);
32 35
33 static OptionsStringResource resources[] = { 36 static OptionsStringResource resources[] = {
34 {"managedUserCreateConfirmTitle", IDS_NEW_LIMITED_USER_SUCCESS_TITLE}, 37 { "managedUserCreateConfirmTitle", IDS_NEW_MANAGED_USER_SUCCESS_TITLE },
Bernhard Bauer 2013/06/20 15:20:35 I think it would make things easier if the strings
35 {"managedUserCreateConfirmTextSlide1", 38 { "managedUserCreateConfirmText",
36 IDS_NEW_LIMITED_USER_SUCCESS_TEXT_SLIDE_1}, 39 IDS_NEW_MANAGED_USER_SUCCESS_TEXT },
37 {"managedUserCreateConfirmTextSlide2", 40 { "managedUserCreateConfirmDone",
38 IDS_NEW_LIMITED_USER_SUCCESS_TEXT_SLIDE_2}, 41 IDS_NEW_MANAGED_USER_SUCCESS_DONE_BUTTON },
39 {"managedUserCreateConfirmTextSlide3", 42 { "managedUserCreateConfirmSwitch",
40 IDS_NEW_LIMITED_USER_SUCCESS_TEXT_SLIDE_3}, 43 IDS_NEW_MANAGED_USER_SUCCESS_SWITCH_BUTTON },
41 {"managedUserCreateConfirmDone", IDS_NEW_LIMITED_USER_SUCCESS_DONE_BUTTON},
42 {"managedUserCreateConfirmSwitch",
43 IDS_NEW_LIMITED_USER_SUCCESS_SWITCH_BUTTON},
44 }; 44 };
45 45
46 SigninManagerBase* signin =
47 SigninManagerFactory::GetForProfile(Profile::FromWebUI(web_ui()));
48 localized_strings->SetString("custodianEmail",
49 signin->GetAuthenticatedUsername());
50
46 RegisterStrings(localized_strings, resources, arraysize(resources)); 51 RegisterStrings(localized_strings, resources, arraysize(resources));
47 } 52 }
48 53
49 void ManagedUserCreateConfirmHandler::RegisterMessages() { 54 void ManagedUserCreateConfirmHandler::RegisterMessages() {
50 web_ui()->RegisterMessageCallback("switchToProfile", 55 web_ui()->RegisterMessageCallback("switchToProfile",
51 base::Bind(&ManagedUserCreateConfirmHandler::SwitchToProfile, 56 base::Bind(&ManagedUserCreateConfirmHandler::SwitchToProfile,
52 base::Unretained(this))); 57 base::Unretained(this)));
53 } 58 }
54 59
55 void ManagedUserCreateConfirmHandler::SwitchToProfile( 60 void ManagedUserCreateConfirmHandler::SwitchToProfile(
(...skipping 19 matching lines...) Expand all
75 80
76 ProfileManager::FindOrCreateNewWindowForProfile( 81 ProfileManager::FindOrCreateNewWindowForProfile(
77 profile, 82 profile,
78 chrome::startup::IS_PROCESS_STARTUP, 83 chrome::startup::IS_PROCESS_STARTUP,
79 chrome::startup::IS_FIRST_RUN, 84 chrome::startup::IS_FIRST_RUN,
80 desktop_type, 85 desktop_type,
81 false); 86 false);
82 } 87 }
83 88
84 } // namespace options 89 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698