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

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

Issue 161113002: Fix pushState causing stop/reload button and favicon to flicker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
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_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_CAPTIVE_PORTAL_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_CAPTIVE_PORTAL_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_CAPTIVE_PORTAL_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include "chrome/browser/chromeos/login/simple_web_view_dialog.h" 9 #include "chrome/browser/chromeos/login/simple_web_view_dialog.h"
10 10
(...skipping 13 matching lines...) Expand all
24 virtual bool CanResize() const OVERRIDE; 24 virtual bool CanResize() const OVERRIDE;
25 virtual ui::ModalType GetModalType() const OVERRIDE; 25 virtual ui::ModalType GetModalType() const OVERRIDE;
26 virtual base::string16 GetWindowTitle() const OVERRIDE; 26 virtual base::string16 GetWindowTitle() const OVERRIDE;
27 virtual bool ShouldShowWindowTitle() const OVERRIDE; 27 virtual bool ShouldShowWindowTitle() const OVERRIDE;
28 virtual views::NonClientFrameView* CreateNonClientFrameView( 28 virtual views::NonClientFrameView* CreateNonClientFrameView(
29 views::Widget* widget) OVERRIDE; 29 views::Widget* widget) OVERRIDE;
30 30
31 // Overridden from content::WebContentsDelegate: 31 // Overridden from content::WebContentsDelegate:
32 virtual void NavigationStateChanged(const content::WebContents* source, 32 virtual void NavigationStateChanged(const content::WebContents* source,
33 unsigned changed_flags) OVERRIDE; 33 unsigned changed_flags) OVERRIDE;
34 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; 34 virtual void LoadingStateChanged(content::WebContents* source,
35 bool to_different_document) OVERRIDE;
35 36
36 private: 37 private:
37 // Contains CaptivePortalWindowProxy to be notified when redirection state is 38 // Contains CaptivePortalWindowProxy to be notified when redirection state is
38 // resolved. 39 // resolved.
39 CaptivePortalWindowProxy* proxy_; 40 CaptivePortalWindowProxy* proxy_;
40 41
41 bool redirected_; 42 bool redirected_;
42 43
43 DISALLOW_COPY_AND_ASSIGN(CaptivePortalView); 44 DISALLOW_COPY_AND_ASSIGN(CaptivePortalView);
44 }; 45 };
45 46
46 } // namespace chromeos 47 } // namespace chromeos
47 48
48 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_CAPTIVE_PORTAL_VIEW_H_ 49 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_CAPTIVE_PORTAL_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_web_contents_delegate_android.cc ('k') | chrome/browser/chromeos/login/captive_portal_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698