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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc

Issue 1829453002: Enable bootstrapping feature by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CL format Created 4 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/login/controller_pairing_screen_handl er.h" 5 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl er.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h" 9 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"
10 #include "chromeos/chromeos_switches.h" 10 #include "chromeos/chromeos_switches.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } 63 }
64 } 64 }
65 65
66 void ControllerPairingScreenHandler::DeclareLocalizedValues( 66 void ControllerPairingScreenHandler::DeclareLocalizedValues(
67 ::login::LocalizedValuesBuilder* builder) { 67 ::login::LocalizedValuesBuilder* builder) {
68 // TODO(dzhioev): Move the prefix logic to the base screen handler after 68 // TODO(dzhioev): Move the prefix logic to the base screen handler after
69 // migration. 69 // migration.
70 std::string prefix; 70 std::string prefix;
71 base::RemoveChars(kJsScreenPath, ".", &prefix); 71 base::RemoveChars(kJsScreenPath, ".", &prefix);
72 72
73 // TODO(xdai): Remove unnecessary strings.
73 builder->Add(prefix + "WelcomeTitle", IDS_PAIRING_CONTROLLER_WELCOME); 74 builder->Add(prefix + "WelcomeTitle", IDS_PAIRING_CONTROLLER_WELCOME);
74 builder->Add(prefix + "Searching", IDS_PAIRING_CONTROLLER_SEARCHING); 75 builder->Add(prefix + "Searching", IDS_PAIRING_CONTROLLER_SEARCHING);
75 builder->Add(prefix + "HelpBtn", IDS_PAIRING_NEED_HELP); 76 builder->Add(prefix + "HelpBtn", IDS_PAIRING_NEED_HELP);
76 builder->Add(prefix + "TroubleConnectingTitle", 77 builder->Add(prefix + "TroubleConnectingTitle",
77 IDS_PAIRING_CONTROLLER_TROUBLE_CONNECTING); 78 IDS_PAIRING_CONTROLLER_TROUBLE_CONNECTING);
78 builder->Add(prefix + "ConnectingAdvice", 79 builder->Add(prefix + "ConnectingAdvice",
79 IDS_PAIRING_CONTROLLER_CONNECTING_ADVICE); 80 IDS_PAIRING_CONTROLLER_CONNECTING_ADVICE);
80 builder->Add(prefix + "AdviceGotItBtn", IDS_PAIRING_CONTROLLER_ADVICE_GOT_IT); 81 builder->Add(prefix + "AdviceGotItBtn", IDS_PAIRING_CONTROLLER_ADVICE_GOT_IT);
81 builder->Add(prefix + "SelectTitle", IDS_PAIRING_CONTROLLER_SELECT_TITLE); 82 builder->Add(prefix + "SelectTitle", IDS_PAIRING_CONTROLLER_SELECT_TITLE);
82 builder->Add(prefix + "ConnectBtn", IDS_PAIRING_CONTROLLER_CONNECT); 83 builder->Add(prefix + "ConnectBtn", IDS_PAIRING_CONTROLLER_CONNECT);
83 builder->Add(prefix + "Connecting", IDS_PAIRING_CONTROLLER_CONNECTING); 84 builder->Add(prefix + "Connecting", IDS_PAIRING_CONTROLLER_CONNECTING);
84 builder->Add(prefix + "ConfirmationTitle", 85 builder->Add(prefix + "ConfirmationTitle",
85 IDS_PAIRING_CONTROLLER_CONFIRMATION_TITLE); 86 IDS_PAIRING_CONTROLLER_CONFIRMATION_TITLE);
86 builder->Add(prefix + "ConfirmationQuestion", 87 builder->Add(prefix + "ConfirmationQuestion",
87 IDS_PAIRING_CONTROLLER_CONFIRMATION_QUESTION); 88 IDS_PAIRING_CONTROLLER_CONFIRMATION_QUESTION);
88 builder->Add(prefix + "RejectCodeBtn", IDS_PAIRING_CONTROLLER_REJECT_CODE); 89 builder->Add(prefix + "RejectCodeBtn", IDS_PAIRING_CONTROLLER_REJECT_CODE);
89 builder->Add(prefix + "AcceptCodeBtn", IDS_PAIRING_CONTROLLER_ACCEPT_CODE); 90 builder->Add(prefix + "AcceptCodeBtn", IDS_PAIRING_CONTROLLER_ACCEPT_CODE);
90 builder->Add(prefix + "UpdateTitle", IDS_PAIRING_CONTROLLER_UPDATE_TITLE); 91 builder->Add(prefix + "UpdateTitle", IDS_PAIRING_CONTROLLER_UPDATE_TITLE);
91 builder->Add(prefix + "UpdateText", IDS_PAIRING_CONTROLLER_UPDATE_TEXT); 92 builder->Add(prefix + "UpdateText", IDS_PAIRING_CONTROLLER_UPDATE_TEXT);
92 builder->Add(prefix + "ConnectionLostTitle", 93 builder->Add(prefix + "ConnectionLostTitle",
93 IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TITLE); 94 IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TITLE);
94 builder->Add(prefix + "ConnectionLostText", 95 builder->Add(prefix + "ConnectionLostText",
95 IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TEXT); 96 IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TEXT);
96 builder->Add(prefix + "HostNetworkErrorTitle", 97 builder->Add(prefix + "HostNetworkErrorTitle",
97 IDS_PAIRING_CONTROLLER_HOST_NETWORK_ERROR_TITLE); 98 IDS_PAIRING_CONTROLLER_HOST_NETWORK_ERROR_TITLE);
98 builder->Add(prefix + "EnrollTitle", IDS_PAIRING_ENROLL_TITLE); 99 builder->Add(prefix + "EnrollTitle", IDS_PAIRING_CONTROLLER_ENROLL_TITLE);
99 builder->Add(prefix + "EnrollText1", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_1); 100 builder->Add(prefix + "EnrollText1", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_1);
100 builder->Add(prefix + "EnrollText2", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_2); 101 builder->Add(prefix + "EnrollText2", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_2);
101 builder->Add(prefix + "ContinueBtn", IDS_PAIRING_CONTROLLER_CONTINUE); 102 builder->Add(prefix + "ContinueBtn", IDS_PAIRING_CONTROLLER_CONTINUE);
102 builder->Add(prefix + "EnrollmentInProgress", 103 builder->Add(prefix + "EnrollmentInProgress",
103 IDS_PAIRING_ENROLLMENT_IN_PROGRESS); 104 IDS_PAIRING_CONTROLLER_ENROLLMENT_IN_PROGRESS);
104 builder->Add(prefix + "EnrollmentErrorTitle", 105 builder->Add(prefix + "EnrollmentErrorTitle",
105 IDS_PAIRING_ENROLLMENT_ERROR_TITLE); 106 IDS_PAIRING_ENROLLMENT_ERROR_TITLE);
106 builder->Add(prefix + "EnrollmentErrorHostRestarts", 107 builder->Add(prefix + "EnrollmentErrorHostRestarts",
107 IDS_PAIRING_CONTROLLER_ENROLLMENT_ERROR_HOST_RESTARTS); 108 IDS_PAIRING_CONTROLLER_ENROLLMENT_ERROR_HOST_RESTARTS);
108 builder->Add(prefix + "SuccessTitle", IDS_PAIRING_CONTROLLER_SUCCESS_TITLE); 109 builder->Add(prefix + "SuccessTitle", IDS_PAIRING_CONTROLLER_SUCCESS_TITLE);
109 builder->Add(prefix + "SuccessText", IDS_PAIRING_CONTROLLER_SUCCESS_TEXT); 110 builder->Add(prefix + "SuccessText", IDS_PAIRING_CONTROLLER_SUCCESS_TEXT);
110 builder->Add(prefix + "ContinueToHangoutsBtn", 111 builder->Add(prefix + "ContinueToHangoutsBtn",
111 IDS_PAIRING_CONTROLLER_CONTINUE_TO_HANGOUTS); 112 IDS_PAIRING_CONTROLLER_CONTINUE_TO_HANGOUTS);
112 113
113 if (IsBootstrappingMaster()) { 114 if (IsBootstrappingMaster()) {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 void ControllerPairingScreenHandler::OnContextChanged( 165 void ControllerPairingScreenHandler::OnContextChanged(
165 const base::DictionaryValue& diff) { 166 const base::DictionaryValue& diff) {
166 CallJS(kMethodContextChanged, diff); 167 CallJS(kMethodContextChanged, diff);
167 } 168 }
168 169
169 content::BrowserContext* ControllerPairingScreenHandler::GetBrowserContext() { 170 content::BrowserContext* ControllerPairingScreenHandler::GetBrowserContext() {
170 return web_ui()->GetWebContents()->GetBrowserContext(); 171 return web_ui()->GetWebContents()->GetBrowserContext();
171 } 172 }
172 173
173 } // namespace chromeos 174 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698