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

Side by Side Diff: chrome/browser/captive_portal/captive_portal_tab_helper.h

Issue 11090068: When starting a provisional load include the parent frame ID in the IPC and pass it down the th WCO… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updatess Created 8 years, 2 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 | « no previous file | chrome/browser/captive_portal/captive_portal_tab_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_ 6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 : public content::WebContentsObserver, 60 : public content::WebContentsObserver,
61 public content::NotificationObserver, 61 public content::NotificationObserver,
62 public base::NonThreadSafe, 62 public base::NonThreadSafe,
63 public content::WebContentsUserData<CaptivePortalTabHelper> { 63 public content::WebContentsUserData<CaptivePortalTabHelper> {
64 public: 64 public:
65 virtual ~CaptivePortalTabHelper(); 65 virtual ~CaptivePortalTabHelper();
66 66
67 // content::WebContentsObserver: 67 // content::WebContentsObserver:
68 virtual void DidStartProvisionalLoadForFrame( 68 virtual void DidStartProvisionalLoadForFrame(
69 int64 frame_id, 69 int64 frame_id,
70 int64 parent_frame_id,
70 bool is_main_frame, 71 bool is_main_frame,
71 const GURL& validated_url, 72 const GURL& validated_url,
72 bool is_error_page, 73 bool is_error_page,
73 content::RenderViewHost* render_view_host) OVERRIDE; 74 content::RenderViewHost* render_view_host) OVERRIDE;
74 75
75 virtual void DidCommitProvisionalLoadForFrame( 76 virtual void DidCommitProvisionalLoadForFrame(
76 int64 frame_id, 77 int64 frame_id,
77 bool is_main_frame, 78 bool is_main_frame,
78 const GURL& url, 79 const GURL& url,
79 content::PageTransition transition_type, 80 content::PageTransition transition_type,
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 content::RenderViewHost* provisional_render_view_host_; 157 content::RenderViewHost* provisional_render_view_host_;
157 158
158 content::NotificationRegistrar registrar_; 159 content::NotificationRegistrar registrar_;
159 160
160 DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper); 161 DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper);
161 }; 162 };
162 163
163 } // namespace captive_portal 164 } // namespace captive_portal
164 165
165 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_ 166 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/captive_portal/captive_portal_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698