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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h"
10 #include "ui/views/widget/widget_observer.h" 11 #include "ui/views/widget/widget_observer.h"
11 12
12 namespace content { 13 namespace content {
13 class WebContents; 14 class WebContents;
14 } 15 }
15 16
16 namespace views { 17 namespace views {
17 class Widget; 18 class Widget;
18 } 19 }
19 20
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 Delegate* delegate_; 107 Delegate* delegate_;
107 // Not owned by this class. 108 // Not owned by this class.
108 views::Widget* widget_; 109 views::Widget* widget_;
109 scoped_ptr<CaptivePortalView> captive_portal_view_; 110 scoped_ptr<CaptivePortalView> captive_portal_view_;
110 111
111 // Not owned by this class. 112 // Not owned by this class.
112 content::WebContents* web_contents_; 113 content::WebContents* web_contents_;
113 114
114 CaptivePortalView* captive_portal_view_for_testing_; 115 CaptivePortalView* captive_portal_view_for_testing_;
115 116
117 base::Time started_loading_at_;
118
116 DISALLOW_COPY_AND_ASSIGN(CaptivePortalWindowProxy); 119 DISALLOW_COPY_AND_ASSIGN(CaptivePortalWindowProxy);
117 }; 120 };
118 121
119 } // namespace chromeos 122 } // namespace chromeos
120 123
121 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_ 124 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698