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

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

Issue 21004005: Made small refactoring of OobeUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed location of .oobe_completed. Created 7 years, 4 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/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
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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 322
323 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) { 323 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) {
324 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID && 324 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID &&
325 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) { 325 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) {
326 LOG(ERROR) << "Renderer crash on lock screen"; 326 LOG(ERROR) << "Renderer crash on lock screen";
327 Signout(); 327 Signout();
328 } 328 }
329 } 329 }
330 330
331 } // namespace chromeos 331 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/startup_utils.cc ('k') | chrome/browser/resources/chromeos/login/display_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698