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

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

Issue 2429033003: cros: Cleanup lock screen and OOBE C++ backing code. (Closed)
Patch Set: Address comments Created 4 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/network_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 core_oobe_actor_->StopDemoModeDetection(); 132 core_oobe_actor_->StopDemoModeDetection();
133 } 133 }
134 134
135 void NetworkScreenHandler::ShowConnectingStatus( 135 void NetworkScreenHandler::ShowConnectingStatus(
136 bool connecting, 136 bool connecting,
137 const base::string16& network_id) { 137 const base::string16& network_id) {
138 } 138 }
139 139
140 void NetworkScreenHandler::ReloadLocalizedContent() { 140 void NetworkScreenHandler::ReloadLocalizedContent() {
141 base::DictionaryValue localized_strings; 141 base::DictionaryValue localized_strings;
142 static_cast<OobeUI*>(web_ui()->GetController()) 142 GetOobeUI()->GetLocalizedStrings(&localized_strings);
143 ->GetLocalizedStrings(&localized_strings);
144 core_oobe_actor_->ReloadContent(localized_strings); 143 core_oobe_actor_->ReloadContent(localized_strings);
145 } 144 }
146 145
147 // NetworkScreenHandler, BaseScreenHandler implementation: -------------------- 146 // NetworkScreenHandler, BaseScreenHandler implementation: --------------------
148 147
149 void NetworkScreenHandler::DeclareLocalizedValues( 148 void NetworkScreenHandler::DeclareLocalizedValues(
150 ::login::LocalizedValuesBuilder* builder) { 149 ::login::LocalizedValuesBuilder* builder) {
151 if (system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation()) 150 if (system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation())
152 builder->Add("networkScreenGreeting", IDS_REMORA_CONFIRM_MESSAGE); 151 builder->Add("networkScreenGreeting", IDS_REMORA_CONFIRM_MESSAGE);
153 else 152 else
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 timezone_option->SetString("value", timezone_id); 286 timezone_option->SetString("value", timezone_id);
288 timezone_option->SetString("title", timezone_name); 287 timezone_option->SetString("title", timezone_name);
289 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id); 288 timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
290 timezone_list->Append(std::move(timezone_option)); 289 timezone_list->Append(std::move(timezone_option));
291 } 290 }
292 291
293 return timezone_list.release(); 292 return timezone_list.release();
294 } 293 }
295 294
296 } // namespace chromeos 295 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698