| 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 17 matching lines...) Expand all Loading... |
| 28 #include "content/public/browser/web_ui.h" | 28 #include "content/public/browser/web_ui.h" |
| 29 #include "ui/aura/client/capture_client.h" | 29 #include "ui/aura/client/capture_client.h" |
| 30 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
| 31 #include "ui/base/x/x11_util.h" | 31 #include "ui/base/x/x11_util.h" |
| 32 #include "ui/gfx/screen.h" | 32 #include "ui/gfx/screen.h" |
| 33 #include "ui/views/controls/webview/webview.h" | 33 #include "ui/views/controls/webview/webview.h" |
| 34 | 34 |
| 35 namespace { | 35 namespace { |
| 36 | 36 |
| 37 // URL which corresponds to the login WebUI. | 37 // URL which corresponds to the login WebUI. |
| 38 const char kLoginURL[] = "chrome://oobe/login#lock"; | 38 const char kLoginURL[] = "chrome://oobe/lock"; |
| 39 | 39 |
| 40 } // namespace | 40 } // namespace |
| 41 | 41 |
| 42 namespace chromeos { | 42 namespace chromeos { |
| 43 | 43 |
| 44 //////////////////////////////////////////////////////////////////////////////// | 44 //////////////////////////////////////////////////////////////////////////////// |
| 45 // WebUIScreenLocker implementation. | 45 // WebUIScreenLocker implementation. |
| 46 | 46 |
| 47 WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker) | 47 WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker) |
| 48 : ScreenLockerDelegate(screen_locker), | 48 : ScreenLockerDelegate(screen_locker), |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 | 321 |
| 322 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) { | 322 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) { |
| 323 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID && | 323 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID && |
| 324 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) { | 324 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) { |
| 325 LOG(ERROR) << "Renderer crash on lock screen"; | 325 LOG(ERROR) << "Renderer crash on lock screen"; |
| 326 Signout(); | 326 Signout(); |
| 327 } | 327 } |
| 328 } | 328 } |
| 329 | 329 |
| 330 } // namespace chromeos | 330 } // namespace chromeos |
| OLD | NEW |