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

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

Issue 1519883003: 1) Add basic configuration (network connection, language, keyboard layout, timezone) setup page. 2)… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the i18n-content HTML format in the html files Created 5 years 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/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 8 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
9 #include "components/login/localized_values_builder.h" 9 #include "components/login/localized_values_builder.h"
10 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 Show(); 54 Show();
55 show_on_init_ = false; 55 show_on_init_ = false;
56 } 56 }
57 } 57 }
58 58
59 void ControllerPairingScreenHandler::DeclareLocalizedValues( 59 void ControllerPairingScreenHandler::DeclareLocalizedValues(
60 ::login::LocalizedValuesBuilder* builder) { 60 ::login::LocalizedValuesBuilder* builder) {
61 // TODO(dzhioev): Move the prefix logic to the base screen handler after 61 // TODO(dzhioev): Move the prefix logic to the base screen handler after
62 // migration. 62 // migration.
63 std::string prefix; 63 std::string prefix;
64 base::ReplaceChars(kJsScreenPath, ".", "_", &prefix); 64 base::RemoveChars(kJsScreenPath, ".", &prefix);
65 prefix += "_";
66 65
67 builder->Add(prefix + "welcomeTitle", IDS_PAIRING_CONTROLLER_WELCOME); 66 builder->Add(prefix + "WelcomeTitle", IDS_PAIRING_CONTROLLER_WELCOME);
68 builder->Add(prefix + "searching", IDS_PAIRING_CONTROLLER_SEARCHING); 67 builder->Add(prefix + "Searching", IDS_PAIRING_CONTROLLER_SEARCHING);
69 builder->Add(prefix + "helpBtn", IDS_PAIRING_NEED_HELP); 68 builder->Add(prefix + "HelpBtn", IDS_PAIRING_NEED_HELP);
70 builder->Add(prefix + "troubleConnectingTitle", 69 builder->Add(prefix + "TroubleConnectingTitle",
71 IDS_PAIRING_CONTROLLER_TROUBLE_CONNECTING); 70 IDS_PAIRING_CONTROLLER_TROUBLE_CONNECTING);
72 builder->Add(prefix + "connectingAdvice", 71 builder->Add(prefix + "ConnectingAdvice",
73 IDS_PAIRING_CONTROLLER_CONNECTING_ADVICE); 72 IDS_PAIRING_CONTROLLER_CONNECTING_ADVICE);
74 builder->Add(prefix + "adviceGotItBtn", IDS_PAIRING_CONTROLLER_ADVICE_GOT_IT); 73 builder->Add(prefix + "AdviceGotItBtn", IDS_PAIRING_CONTROLLER_ADVICE_GOT_IT);
75 builder->Add(prefix + "selectTitle", IDS_PAIRING_CONTROLLER_SELECT_TITLE); 74 builder->Add(prefix + "SelectTitle", IDS_PAIRING_CONTROLLER_SELECT_TITLE);
76 builder->Add(prefix + "connectBtn", IDS_PAIRING_CONTROLLER_CONNECT); 75 builder->Add(prefix + "ConnectBtn", IDS_PAIRING_CONTROLLER_CONNECT);
77 builder->Add(prefix + "connecting", IDS_PAIRING_CONTROLLER_CONNECTING); 76 builder->Add(prefix + "Connecting", IDS_PAIRING_CONTROLLER_CONNECTING);
78 builder->Add(prefix + "confirmationTitle", 77 builder->Add(prefix + "ConfirmationTitle",
79 IDS_PAIRING_CONTROLLER_CONFIRMATION_TITLE); 78 IDS_PAIRING_CONTROLLER_CONFIRMATION_TITLE);
80 builder->Add(prefix + "confirmationQuestion", 79 builder->Add(prefix + "ConfirmationQuestion",
81 IDS_PAIRING_CONTROLLER_CONFIRMATION_QUESTION); 80 IDS_PAIRING_CONTROLLER_CONFIRMATION_QUESTION);
82 builder->Add(prefix + "rejectCodeBtn", IDS_PAIRING_CONTROLLER_REJECT_CODE); 81 builder->Add(prefix + "RejectCodeBtn", IDS_PAIRING_CONTROLLER_REJECT_CODE);
83 builder->Add(prefix + "acceptCodeBtn", IDS_PAIRING_CONTROLLER_ACCEPT_CODE); 82 builder->Add(prefix + "AcceptCodeBtn", IDS_PAIRING_CONTROLLER_ACCEPT_CODE);
84 builder->Add(prefix + "updateTitle", IDS_PAIRING_CONTROLLER_UPDATE_TITLE); 83 builder->Add(prefix + "UpdateTitle", IDS_PAIRING_CONTROLLER_UPDATE_TITLE);
85 builder->Add(prefix + "updateText", IDS_PAIRING_CONTROLLER_UPDATE_TEXT); 84 builder->Add(prefix + "UpdateText", IDS_PAIRING_CONTROLLER_UPDATE_TEXT);
86 builder->Add(prefix + "connectionLostTitle", 85 builder->Add(prefix + "ConnectionLostTitle",
87 IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TITLE); 86 IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TITLE);
88 builder->Add(prefix + "connectionLostText", 87 builder->Add(prefix + "ConnectionLostText",
89 IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TEXT); 88 IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TEXT);
90 builder->Add(prefix + "enrollTitle", IDS_PAIRING_ENROLL_TITLE); 89 builder->Add(prefix + "EnrollTitle", IDS_PAIRING_ENROLL_TITLE);
91 builder->Add(prefix + "enrollText1", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_1); 90 builder->Add(prefix + "EnrollText1", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_1);
92 builder->Add(prefix + "enrollText2", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_2); 91 builder->Add(prefix + "EnrollText2", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_2);
93 builder->Add(prefix + "continueBtn", IDS_PAIRING_CONTROLLER_CONTINUE); 92 builder->Add(prefix + "ContinueBtn", IDS_PAIRING_CONTROLLER_CONTINUE);
94 builder->Add(prefix + "enrollmentInProgress", 93 builder->Add(prefix + "EnrollmentInProgress",
95 IDS_PAIRING_ENROLLMENT_IN_PROGRESS); 94 IDS_PAIRING_ENROLLMENT_IN_PROGRESS);
96 builder->Add(prefix + "enrollmentErrorTitle", 95 builder->Add(prefix + "EnrollmentErrorTitle",
97 IDS_PAIRING_ENROLLMENT_ERROR_TITLE); 96 IDS_PAIRING_ENROLLMENT_ERROR_TITLE);
98 builder->Add(prefix + "enrollmentErrorHostRestarts", 97 builder->Add(prefix + "EnrollmentErrorHostRestarts",
99 IDS_PAIRING_CONTROLLER_ENROLLMENT_ERROR_HOST_RESTARTS); 98 IDS_PAIRING_CONTROLLER_ENROLLMENT_ERROR_HOST_RESTARTS);
100 builder->Add(prefix + "successTitle", IDS_PAIRING_CONTROLLER_SUCCESS_TITLE); 99 builder->Add(prefix + "SuccessTitle", IDS_PAIRING_CONTROLLER_SUCCESS_TITLE);
101 builder->Add(prefix + "successText", IDS_PAIRING_CONTROLLER_SUCCESS_TEXT); 100 builder->Add(prefix + "SuccessText", IDS_PAIRING_CONTROLLER_SUCCESS_TEXT);
102 builder->Add(prefix + "continueToHangoutsBtn", 101 builder->Add(prefix + "ContinueToHangoutsBtn",
103 IDS_PAIRING_CONTROLLER_CONTINUE_TO_HANGOUTS); 102 IDS_PAIRING_CONTROLLER_CONTINUE_TO_HANGOUTS);
104 } 103 }
105 104
106 void ControllerPairingScreenHandler::RegisterMessages() { 105 void ControllerPairingScreenHandler::RegisterMessages() {
107 AddPrefixedCallback(kCallbackUserActed, 106 AddPrefixedCallback(kCallbackUserActed,
108 &ControllerPairingScreenHandler::HandleUserActed); 107 &ControllerPairingScreenHandler::HandleUserActed);
109 AddPrefixedCallback(kCallbackContextChanged, 108 AddPrefixedCallback(kCallbackContextChanged,
110 &ControllerPairingScreenHandler::HandleContextChanged); 109 &ControllerPairingScreenHandler::HandleContextChanged);
111 } 110 }
112 111
(...skipping 17 matching lines...) Expand all
130 void ControllerPairingScreenHandler::OnContextChanged( 129 void ControllerPairingScreenHandler::OnContextChanged(
131 const base::DictionaryValue& diff) { 130 const base::DictionaryValue& diff) {
132 CallJS(kMethodContextChanged, diff); 131 CallJS(kMethodContextChanged, diff);
133 } 132 }
134 133
135 content::BrowserContext* ControllerPairingScreenHandler::GetBrowserContext() { 134 content::BrowserContext* ControllerPairingScreenHandler::GetBrowserContext() {
136 return web_ui()->GetWebContents()->GetBrowserContext(); 135 return web_ui()->GetWebContents()->GetBrowserContext();
137 } 136 }
138 137
139 } // namespace chromeos 138 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698