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

Side by Side Diff: chrome/browser/chromeos/login/captive_portal_window_proxy.h

Issue 15780006: Added bowser test for Captive Portal Window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added captive_portal_window_borwsertest.cc to git index. Created 7 years, 7 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_CAPTIVE_PORTAL_WINDOW_PROXY_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_CAPTIVE_PORTAL_WINDOW_PROXY_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_CAPTIVE_PORTAL_WINDOW_PROXY_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_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 "ui/gfx/native_widget_types.h" 10 #include "ui/gfx/native_widget_types.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 // Called by CaptivePortalView when URL loading was redirected from the 52 // Called by CaptivePortalView when URL loading was redirected from the
53 // original URL. 53 // original URL.
54 void OnRedirected(); 54 void OnRedirected();
55 55
56 // Called by CaptivePortalView when origin URL is loaded without any 56 // Called by CaptivePortalView when origin URL is loaded without any
57 // redirections. 57 // redirections.
58 void OnOriginalURLLoaded(); 58 void OnOriginalURLLoaded();
59 59
60 // Overridden from views::WidgetObserver: 60 // Overridden from views::WidgetObserver:
61 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; 61 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
62 62
63 private: 63 private:
64 friend class CaptivePortalWindowTest;
65
66 // Initializes |captive_portal_view_| if it is not initialized and
67 // starts load.
Nikita (slow) 2013/05/27 16:55:35 nit: starts loading CP redirect URL.
ygorshenin1 2013/05/28 10:04:14 Done.
68 void InitCaptivePortalView();
69
70 bool IsShown() const;
71
64 Delegate* delegate_; 72 Delegate* delegate_;
65 views::Widget* widget_; 73 views::Widget* widget_;
66 scoped_ptr<CaptivePortalView> captive_portal_view_; 74 scoped_ptr<CaptivePortalView> captive_portal_view_;
67 gfx::NativeWindow parent_; 75 gfx::NativeWindow parent_;
68 76
69 DISALLOW_COPY_AND_ASSIGN(CaptivePortalWindowProxy); 77 DISALLOW_COPY_AND_ASSIGN(CaptivePortalWindowProxy);
70 }; 78 };
71 79
72 } // namespace chromeos 80 } // namespace chromeos
73 81
74 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_CAPTIVE_PORTAL_WINDOW_PROXY_H_ 82 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_CAPTIVE_PORTAL_WINDOW_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698