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

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

Issue 755203002: Added usage of ScreenContext in EulaScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, fix to Screen.initialize(). Created 6 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 const char OobeUI::kScreenHostPairing[] = "host-pairing"; 187 const char OobeUI::kScreenHostPairing[] = "host-pairing";
188 const char OobeUI::kScreenDeviceDisabled[] = "device-disabled"; 188 const char OobeUI::kScreenDeviceDisabled[] = "device-disabled";
189 189
190 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url) 190 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
191 : WebUIController(web_ui), 191 : WebUIController(web_ui),
192 core_handler_(NULL), 192 core_handler_(NULL),
193 network_dropdown_handler_(NULL), 193 network_dropdown_handler_(NULL),
194 update_screen_handler_(NULL), 194 update_screen_handler_(NULL),
195 network_screen_actor_(NULL), 195 network_screen_actor_(NULL),
196 debugging_screen_actor_(NULL), 196 debugging_screen_actor_(NULL),
197 eula_screen_actor_(NULL), 197 eula_view_(NULL),
198 hid_detection_screen_actor_(NULL), 198 hid_detection_screen_actor_(NULL),
199 reset_screen_actor_(NULL), 199 reset_screen_actor_(NULL),
200 autolaunch_screen_actor_(NULL), 200 autolaunch_screen_actor_(NULL),
201 kiosk_enable_screen_actor_(NULL), 201 kiosk_enable_screen_actor_(NULL),
202 wrong_hwid_screen_actor_(NULL), 202 wrong_hwid_screen_actor_(NULL),
203 auto_enrollment_check_screen_actor_(NULL), 203 auto_enrollment_check_screen_actor_(NULL),
204 supervised_user_creation_screen_actor_(NULL), 204 supervised_user_creation_screen_actor_(NULL),
205 app_launch_splash_screen_actor_(NULL), 205 app_launch_splash_screen_actor_(NULL),
206 controller_pairing_screen_actor_(NULL), 206 controller_pairing_screen_actor_(NULL),
207 host_pairing_screen_actor_(NULL), 207 host_pairing_screen_actor_(NULL),
(...skipping 29 matching lines...) Expand all
237 network_screen_actor_ = network_screen_handler; 237 network_screen_actor_ = network_screen_handler;
238 AddScreenHandler(network_screen_handler); 238 AddScreenHandler(network_screen_handler);
239 } 239 }
240 240
241 EnableDebuggingScreenHandler* debugging_screen_handler = 241 EnableDebuggingScreenHandler* debugging_screen_handler =
242 new EnableDebuggingScreenHandler(); 242 new EnableDebuggingScreenHandler();
243 debugging_screen_actor_ = debugging_screen_handler; 243 debugging_screen_actor_ = debugging_screen_handler;
244 AddScreenHandler(debugging_screen_handler); 244 AddScreenHandler(debugging_screen_handler);
245 245
246 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler(core_handler_); 246 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler(core_handler_);
247 eula_screen_actor_ = eula_screen_handler; 247 eula_view_ = eula_screen_handler;
248 AddScreenHandler(eula_screen_handler); 248 AddScreenHandler(eula_screen_handler);
249 249
250 ResetScreenHandler* reset_screen_handler = new ResetScreenHandler(); 250 ResetScreenHandler* reset_screen_handler = new ResetScreenHandler();
251 reset_screen_actor_ = reset_screen_handler; 251 reset_screen_actor_ = reset_screen_handler;
252 AddScreenHandler(reset_screen_handler); 252 AddScreenHandler(reset_screen_handler);
253 253
254 KioskAutolaunchScreenHandler* autolaunch_screen_handler = 254 KioskAutolaunchScreenHandler* autolaunch_screen_handler =
255 new KioskAutolaunchScreenHandler(); 255 new KioskAutolaunchScreenHandler();
256 autolaunch_screen_actor_ = autolaunch_screen_handler; 256 autolaunch_screen_actor_ = autolaunch_screen_handler;
257 AddScreenHandler(autolaunch_screen_handler); 257 AddScreenHandler(autolaunch_screen_handler);
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 } 390 }
391 391
392 UpdateScreenActor* OobeUI::GetUpdateScreenActor() { 392 UpdateScreenActor* OobeUI::GetUpdateScreenActor() {
393 return update_screen_handler_; 393 return update_screen_handler_;
394 } 394 }
395 395
396 NetworkScreenActor* OobeUI::GetNetworkScreenActor() { 396 NetworkScreenActor* OobeUI::GetNetworkScreenActor() {
397 return network_screen_actor_; 397 return network_screen_actor_;
398 } 398 }
399 399
400 EulaScreenActor* OobeUI::GetEulaScreenActor() { 400 EulaView* OobeUI::GetEulaView() {
401 return eula_screen_actor_; 401 return eula_view_;
402 } 402 }
403 403
404 EnableDebuggingScreenActor* OobeUI::GetEnableDebuggingScreenActor() { 404 EnableDebuggingScreenActor* OobeUI::GetEnableDebuggingScreenActor() {
405 return debugging_screen_actor_; 405 return debugging_screen_actor_;
406 } 406 }
407 407
408 EnrollmentScreenActor* OobeUI::GetEnrollmentScreenActor() { 408 EnrollmentScreenActor* OobeUI::GetEnrollmentScreenActor() {
409 return enrollment_screen_actor_; 409 return enrollment_screen_actor_;
410 } 410 }
411 411
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 DCHECK(screen_ids_.count(screen)) 612 DCHECK(screen_ids_.count(screen))
613 << "Screen should be registered in InitializeScreenMaps()"; 613 << "Screen should be registered in InitializeScreenMaps()";
614 Screen new_screen = screen_ids_[screen]; 614 Screen new_screen = screen_ids_[screen];
615 FOR_EACH_OBSERVER(Observer, 615 FOR_EACH_OBSERVER(Observer,
616 observer_list_, 616 observer_list_,
617 OnCurrentScreenChanged(current_screen_, new_screen)); 617 OnCurrentScreenChanged(current_screen_, new_screen));
618 current_screen_ = new_screen; 618 current_screen_ = new_screen;
619 } 619 }
620 620
621 } // namespace chromeos 621 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698