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/webui_screen_locker.h" | 5 #include "chrome/browser/chromeos/login/webui_screen_locker.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/wm/lock_state_controller.h" | 8 #include "ash/wm/lock_state_controller.h" |
9 #include "ash/wm/lock_state_observer.h" | 9 #include "ash/wm/lock_state_observer.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 lock_window_->AddObserver(this); | 67 lock_window_->AddObserver(this); |
68 WebUILoginView::Init(); | 68 WebUILoginView::Init(); |
69 lock_window_->SetContentsView(this); | 69 lock_window_->SetContentsView(this); |
70 lock_window_->Show(); | 70 lock_window_->Show(); |
71 LoadURL(GURL(kLoginURL)); | 71 LoadURL(GURL(kLoginURL)); |
72 lock_window->Grab(); | 72 lock_window->Grab(); |
73 | 73 |
74 login_display_.reset(new WebUILoginDisplay(this)); | 74 login_display_.reset(new WebUILoginDisplay(this)); |
75 login_display_->set_background_bounds(bounds); | 75 login_display_->set_background_bounds(bounds); |
76 login_display_->set_parent_window(GetNativeWindow()); | 76 login_display_->set_parent_window(GetNativeWindow()); |
77 login_display_->Init(screen_locker()->users(), false, true, false); | 77 login_display_->Init(screen_locker()->users(), false, true, true, false); |
78 | 78 |
79 static_cast<OobeUI*>(GetWebUI()->GetController())->ShowSigninScreen( | 79 static_cast<OobeUI*>(GetWebUI()->GetController())->ShowSigninScreen( |
80 LoginScreenContext(), login_display_.get(), login_display_.get()); | 80 LoginScreenContext(), login_display_.get(), login_display_.get()); |
81 | 81 |
82 registrar_.Add(this, | 82 registrar_.Add(this, |
83 chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED, | 83 chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED, |
84 content::NotificationService::AllSources()); | 84 content::NotificationService::AllSources()); |
85 } | 85 } |
86 | 86 |
87 void WebUIScreenLocker::ScreenLockReady() { | 87 void WebUIScreenLocker::ScreenLockReady() { |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 | 356 |
357 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) { | 357 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) { |
358 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID && | 358 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID && |
359 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) { | 359 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) { |
360 LOG(ERROR) << "Renderer crash on lock screen"; | 360 LOG(ERROR) << "Renderer crash on lock screen"; |
361 Signout(); | 361 Signout(); |
362 } | 362 } |
363 } | 363 } |
364 | 364 |
365 } // namespace chromeos | 365 } // namespace chromeos |
OLD | NEW |