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

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

Issue 273533004: Flag covering HID-detection OOBE screen removed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 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 (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 "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 new WrongHWIDScreenHandler(); 233 new WrongHWIDScreenHandler();
234 wrong_hwid_screen_actor_ = wrong_hwid_screen_handler; 234 wrong_hwid_screen_actor_ = wrong_hwid_screen_handler;
235 AddScreenHandler(wrong_hwid_screen_handler); 235 AddScreenHandler(wrong_hwid_screen_handler);
236 236
237 AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler = 237 AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler =
238 new AutoEnrollmentCheckScreenHandler(); 238 new AutoEnrollmentCheckScreenHandler();
239 auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler; 239 auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler;
240 AddScreenHandler(auto_enrollment_check_screen_handler); 240 AddScreenHandler(auto_enrollment_check_screen_handler);
241 241
242 HIDDetectionScreenHandler* hid_detection_screen_handler = 242 HIDDetectionScreenHandler* hid_detection_screen_handler =
243 new HIDDetectionScreenHandler(); 243 new HIDDetectionScreenHandler(core_handler_);
244 hid_detection_screen_actor_ = hid_detection_screen_handler; 244 hid_detection_screen_actor_ = hid_detection_screen_handler;
245 AddScreenHandler(hid_detection_screen_handler); 245 AddScreenHandler(hid_detection_screen_handler);
246 246
247 EnrollmentScreenHandler* enrollment_screen_handler = 247 EnrollmentScreenHandler* enrollment_screen_handler =
248 new EnrollmentScreenHandler(); 248 new EnrollmentScreenHandler();
249 enrollment_screen_actor_ = enrollment_screen_handler; 249 enrollment_screen_actor_ = enrollment_screen_handler;
250 AddScreenHandler(enrollment_screen_handler); 250 AddScreenHandler(enrollment_screen_handler);
251 251
252 TermsOfServiceScreenHandler* terms_of_service_screen_handler = 252 TermsOfServiceScreenHandler* terms_of_service_screen_handler =
253 new TermsOfServiceScreenHandler; 253 new TermsOfServiceScreenHandler;
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 observer_list_, 524 observer_list_,
525 OnCurrentScreenChanged(current_screen_, new_screen)); 525 OnCurrentScreenChanged(current_screen_, new_screen));
526 current_screen_ = new_screen; 526 current_screen_ = new_screen;
527 } else { 527 } else {
528 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 528 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
529 current_screen_ = SCREEN_UNKNOWN; 529 current_screen_ = SCREEN_UNKNOWN;
530 } 530 }
531 } 531 }
532 532
533 } // namespace chromeos 533 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698