chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc - Issue 13878010: Merge WebUILoginDisplayHost into LoginDisplayHostImpl

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc

Issue 13878010: Merge WebUILoginDisplayHost into LoginDisplayHostImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge + move method definition Created 7 years, 8 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

« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/ui/webui/chromeos/login/error_screen_handler.h"	5 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/message_loop.h"	8 #include "base/message_loop.h"

9 #include "base/time.h"	9 #include "base/time.h"

10 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"	10 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"

11 #include "chrome/browser/chromeos/login/webui_login_display_host.h"

12 #include "chrome/browser/chromeos/net/network_portal_detector.h"	11 #include "chrome/browser/chromeos/net/network_portal_detector.h"

13 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"	12 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"

14 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"	13 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"

15 #include "chrome/common/chrome_notification_types.h"	14 #include "chrome/common/chrome_notification_types.h"

16 #include "grit/generated_resources.h"	15 #include "grit/generated_resources.h"

17	16

18 namespace chromeos {	17 namespace chromeos {

19	18

20 namespace {	19 namespace {

21	20

(...skipping 133 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
155 void ErrorScreenHandler::Initialize() {	154 void ErrorScreenHandler::Initialize() {

156 if (!page_is_ready())	155 if (!page_is_ready())

157 return;	156 return;

158 if (show_on_init_) {	157 if (show_on_init_) {

159 Show(parent_screen_, NULL);	158 Show(parent_screen_, NULL);

160 show_on_init_ = false;	159 show_on_init_ = false;

161 }	160 }

162 }	161 }

163	162

164 } // namespace chromeos	163 } // namespace chromeos

OLD	NEW