chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h - Issue 1018523007: ChromeOS: Do not show the error dialog when captive portal is detected in OOBE.

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

Unified Diff: chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h

Issue 1018523007: ChromeOS: Do not show the error dialog when captive portal is detected in OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed browser tests. Created 5 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/screens/update_screen_browsertest.cc ('k') | chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h

diff --git a/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h b/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h

index 53482b24027816fc032049d1ca6c4ca506cb6be6..f301d46eb17f84810c60e70f30ca1823105e029a 100644

--- a/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h

+++ b/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h

@@ -7,6 +7,7 @@

#include "base/compiler_specific.h"

#include "base/memory/scoped_ptr.h"

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

#include "ui/views/widget/widget_observer.h"

namespace content {

@@ -113,6 +114,8 @@ class CaptivePortalWindowProxy : public views::WidgetObserver {

CaptivePortalView* captive_portal_view_for_testing_;

+ base::Time started_loading_at_;

DISALLOW_COPY_AND_ASSIGN(CaptivePortalWindowProxy);

};