OLD | NEW |
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 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 return wizard_controller_.get(); | 402 return wizard_controller_.get(); |
403 } | 403 } |
404 | 404 |
405 void LoginDisplayHostImpl::StartUserAdding( | 405 void LoginDisplayHostImpl::StartUserAdding( |
406 const base::Closure& completion_callback) { | 406 const base::Closure& completion_callback) { |
407 restore_path_ = RESTORE_ADD_USER_INTO_SESSION; | 407 restore_path_ = RESTORE_ADD_USER_INTO_SESSION; |
408 completion_callback_ = completion_callback; | 408 completion_callback_ = completion_callback; |
409 LOG(INFO) << "Login WebUI >> user adding"; | 409 LOG(INFO) << "Login WebUI >> user adding"; |
410 if (!login_window_) | 410 if (!login_window_) |
411 LoadURL(GURL(kUserAddingURL)); | 411 LoadURL(GURL(kUserAddingURL)); |
| 412 // We should emit this signal only at login screen (after reboot or sign out). |
| 413 login_view_->set_should_emit_login_prompt_visible(false); |
412 | 414 |
413 // Lock container can be transparent after lock screen animation. | 415 // Lock container can be transparent after lock screen animation. |
414 aura::Window* lock_container = ash::Shell::GetContainer( | 416 aura::Window* lock_container = ash::Shell::GetContainer( |
415 ash::Shell::GetPrimaryRootWindow(), | 417 ash::Shell::GetPrimaryRootWindow(), |
416 ash::internal::kShellWindowId_LockScreenContainersContainer); | 418 ash::internal::kShellWindowId_LockScreenContainersContainer); |
417 lock_container->layer()->SetOpacity(1.0); | 419 lock_container->layer()->SetOpacity(1.0); |
418 | 420 |
419 ash::Shell::GetInstance()-> | 421 ash::Shell::GetInstance()-> |
420 desktop_background_controller()->MoveDesktopToLockedContainer(); | 422 desktop_background_controller()->MoveDesktopToLockedContainer(); |
421 | 423 |
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
957 VLOG(1) << "Initial time zone: " << timezone_name; | 959 VLOG(1) << "Initial time zone: " << timezone_name; |
958 // Apply locale customizations only once to preserve whatever locale | 960 // Apply locale customizations only once to preserve whatever locale |
959 // user has changed to during OOBE. | 961 // user has changed to during OOBE. |
960 if (!timezone_name.empty()) { | 962 if (!timezone_name.empty()) { |
961 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( | 963 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( |
962 UTF8ToUTF16(timezone_name)); | 964 UTF8ToUTF16(timezone_name)); |
963 } | 965 } |
964 } | 966 } |
965 | 967 |
966 } // namespace chromeos | 968 } // namespace chromeos |
OLD | NEW |