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

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

Issue 23449023: Add kiosk browser tests for network configuration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/browser_about_handler.h" 12 #include "chrome/browser/browser_about_handler.h"
13 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 14 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
14 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" 15 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
15 #include "chrome/browser/chromeos/login/login_display_host_impl.h" 16 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
16 #include "chrome/browser/chromeos/login/screen_locker.h" 17 #include "chrome/browser/chromeos/login/screen_locker.h"
17 #include "chrome/browser/chromeos/login/user_manager.h" 18 #include "chrome/browser/chromeos/login/user_manager.h"
18 #include "chrome/browser/chromeos/login/wizard_controller.h" 19 #include "chrome/browser/chromeos/login/wizard_controller.h"
19 #include "chrome/browser/chromeos/system/input_device_settings.h" 20 #include "chrome/browser/chromeos/system/input_device_settings.h"
20 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ui/webui/about_ui.h" 22 #include "chrome/browser/ui/webui/about_ui.h"
22 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h" 23 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 signin_screen_handler_->SetNativeWindowDelegate(NULL); 460 signin_screen_handler_->SetNativeWindowDelegate(NULL);
460 } 461 }
461 462
462 const std::string& OobeUI::GetScreenName(Screen screen) const { 463 const std::string& OobeUI::GetScreenName(Screen screen) const {
463 DCHECK(screen >= 0 && screen < SCREEN_UNKNOWN); 464 DCHECK(screen >= 0 && screen < SCREEN_UNKNOWN);
464 return screen_names_[static_cast<size_t>(screen)]; 465 return screen_names_[static_cast<size_t>(screen)];
465 } 466 }
466 467
467 void OobeUI::OnCurrentScreenChanged(const std::string& screen) { 468 void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
468 if (screen_ids_.count(screen)) { 469 if (screen_ids_.count(screen)) {
470 OobeDisplay::ScreenTransition details;
471 details.previous_screen = current_screen_;
472 details.current_screen = screen_ids_[screen];
473 DVLOG(1) << "Screen changed from "
474 << screen_names_[details.previous_screen]
475 << " to " << screen_names_[details.current_screen];
476 content::NotificationService::current()->Notify(
477 chrome::NOTIFICATION_CURRENT_SCREEN_CHANGED,
478 content::NotificationService::AllSources(),
479 content::Details<OobeDisplay::ScreenTransition>(&details));
480
469 current_screen_ = screen_ids_[screen]; 481 current_screen_ = screen_ids_[screen];
470 } else { 482 } else {
471 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 483 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
472 current_screen_ = SCREEN_UNKNOWN; 484 current_screen_ = SCREEN_UNKNOWN;
473 } 485 }
474 } 486 }
475 487
476 } // namespace chromeos 488 } // namespace chromeos
OLDNEW
« chrome/browser/chrome_notification_types.h ('K') | « chrome/browser/chromeos/login/oobe_display.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698