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

Side by Side Diff: chrome/browser/prerender/prerender_tab_helper.h

Issue 565263005: Remove the use of ProvisionalChangeToMainFrameUrl from prerender code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@redirsupervised
Patch Set: fixing Created 6 years, 3 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 (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_PRERENDER_PRERENDER_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_TAB_HELPER_H_
6 #define CHROME_BROWSER_PRERENDER_PRERENDER_TAB_HELPER_H_ 6 #define CHROME_BROWSER_PRERENDER_PRERENDER_TAB_HELPER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 EVENT_MAX_VALUE 44 EVENT_MAX_VALUE
45 }; 45 };
46 46
47 static void CreateForWebContentsWithPasswordManager( 47 static void CreateForWebContentsWithPasswordManager(
48 content::WebContents* web_contents, 48 content::WebContents* web_contents,
49 password_manager::PasswordManager* password_manager); 49 password_manager::PasswordManager* password_manager);
50 50
51 virtual ~PrerenderTabHelper(); 51 virtual ~PrerenderTabHelper();
52 52
53 // content::WebContentsObserver implementation. 53 // content::WebContentsObserver implementation.
54 virtual void ProvisionalChangeToMainFrameUrl( 54 virtual void DidGetRedirectForResourceRequest(
55 const GURL& url, 55 content::RenderViewHost* render_view_host,
56 content::RenderFrameHost* render_frame_host) OVERRIDE; 56 const content::ResourceRedirectDetails& details) OVERRIDE;
57 virtual void DidStopLoading( 57 virtual void DidStopLoading(
58 content::RenderViewHost* render_view_host) OVERRIDE; 58 content::RenderViewHost* render_view_host) OVERRIDE;
59 virtual void DidStartProvisionalLoadForFrame( 59 virtual void DidStartProvisionalLoadForFrame(
60 content::RenderFrameHost* render_frame_host, 60 content::RenderFrameHost* render_frame_host,
61 const GURL& validated_url, 61 const GURL& validated_url,
62 bool is_error_page, 62 bool is_error_page,
63 bool is_iframe_srcdoc) OVERRIDE; 63 bool is_iframe_srcdoc) OVERRIDE;
64 virtual void DidCommitProvisionalLoadForFrame( 64 virtual void DidCommitProvisionalLoadForFrame(
65 content::RenderFrameHost* render_frame_host, 65 content::RenderFrameHost* render_frame_host,
66 const GURL& validated_url, 66 const GURL& validated_url,
67 ui::PageTransition transition_type) OVERRIDE; 67 ui::PageTransition transition_type) OVERRIDE;
68 68
69 // Called when the URL of the main frame changed, either when the load
70 // commits, or a redirect happens.
71 void MainFrameUrlDidChange(const GURL& url);
72
69 // Called when a password form has been submitted. 73 // Called when a password form has been submitted.
70 void PasswordSubmitted(const autofill::PasswordForm& form); 74 void PasswordSubmitted(const autofill::PasswordForm& form);
71 75
72 // Called when this prerendered WebContents has just been swapped in. 76 // Called when this prerendered WebContents has just been swapped in.
73 void PrerenderSwappedIn(); 77 void PrerenderSwappedIn();
74 78
75 // Called when a control prerender is resolved. Applies to the next load. 79 // Called when a control prerender is resolved. Applies to the next load.
76 void WouldHavePrerenderedNextLoad(Origin origin); 80 void WouldHavePrerenderedNextLoad(Origin origin);
77 81
78 private: 82 private:
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 GURL url_; 129 GURL url_;
126 130
127 base::WeakPtrFactory<PrerenderTabHelper> weak_factory_; 131 base::WeakPtrFactory<PrerenderTabHelper> weak_factory_;
128 132
129 DISALLOW_COPY_AND_ASSIGN(PrerenderTabHelper); 133 DISALLOW_COPY_AND_ASSIGN(PrerenderTabHelper);
130 }; 134 };
131 135
132 } // namespace prerender 136 } // namespace prerender
133 137
134 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_TAB_HELPER_H_ 138 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_manager.cc ('k') | chrome/browser/prerender/prerender_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698