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

Side by Side Diff: chrome/browser/chromeos/login/login_display_host_impl.cc

Issue 23449023: Add kiosk browser tests for network configuration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix flakiness 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/chromeos/login/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/desktop_background/desktop_background_controller.h" 9 #include "ash/desktop_background/desktop_background_controller.h"
10 #include "ash/desktop_background/user_wallpaper_delegate.h" 10 #include "ash/desktop_background/user_wallpaper_delegate.h"
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 405
406 oobe_progress_bar_visible_ = !StartupUtils::IsDeviceRegistered(); 406 oobe_progress_bar_visible_ = !StartupUtils::IsDeviceRegistered();
407 SetOobeProgressBarVisible(oobe_progress_bar_visible_); 407 SetOobeProgressBarVisible(oobe_progress_bar_visible_);
408 wizard_controller_->Init(first_screen_name, screen_parameters.Pass()); 408 wizard_controller_->Init(first_screen_name, screen_parameters.Pass());
409 } 409 }
410 410
411 WizardController* LoginDisplayHostImpl::GetWizardController() { 411 WizardController* LoginDisplayHostImpl::GetWizardController() {
412 return wizard_controller_.get(); 412 return wizard_controller_.get();
413 } 413 }
414 414
415 AppLaunchController* LoginDisplayHostImpl::GetAppLaunchController() {
416 return app_launch_controller_.get();
417 }
418
415 void LoginDisplayHostImpl::StartUserAdding( 419 void LoginDisplayHostImpl::StartUserAdding(
416 const base::Closure& completion_callback) { 420 const base::Closure& completion_callback) {
417 restore_path_ = RESTORE_ADD_USER_INTO_SESSION; 421 restore_path_ = RESTORE_ADD_USER_INTO_SESSION;
418 completion_callback_ = completion_callback; 422 completion_callback_ = completion_callback;
419 LOG(WARNING) << "Login WebUI >> user adding"; 423 LOG(WARNING) << "Login WebUI >> user adding";
420 if (!login_window_) 424 if (!login_window_)
421 LoadURL(GURL(kUserAddingURL)); 425 LoadURL(GURL(kUserAddingURL));
422 // We should emit this signal only at login screen (after reboot or sign out). 426 // We should emit this signal only at login screen (after reboot or sign out).
423 login_view_->set_should_emit_login_prompt_visible(false); 427 login_view_->set_should_emit_login_prompt_visible(false);
424 428
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 VLOG(1) << "Initial time zone: " << timezone_name; 996 VLOG(1) << "Initial time zone: " << timezone_name;
993 // Apply locale customizations only once to preserve whatever locale 997 // Apply locale customizations only once to preserve whatever locale
994 // user has changed to during OOBE. 998 // user has changed to during OOBE.
995 if (!timezone_name.empty()) { 999 if (!timezone_name.empty()) {
996 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( 1000 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
997 UTF8ToUTF16(timezone_name)); 1001 UTF8ToUTF16(timezone_name));
998 } 1002 }
999 } 1003 }
1000 1004
1001 } // namespace chromeos 1005 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_display_host_impl.h ('k') | chrome/browser/chromeos/login/mock_login_display_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698