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

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

Issue 233353003: Only commit cookie changes in prerenders after a prerender is shown (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Add browser tests, fix a bug in what was changed yesterday. Created 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_EXTERNAL_PRERENDER_HANDLER_ANDROID_H_ 5 #ifndef CHROME_BROWSER_PRERENDER_EXTERNAL_PRERENDER_HANDLER_ANDROID_H_
6 #define CHROME_BROWSER_PRERENDER_EXTERNAL_PRERENDER_HANDLER_ANDROID_H_ 6 #define CHROME_BROWSER_PRERENDER_EXTERNAL_PRERENDER_HANDLER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 27 matching lines...) Expand all
38 38
39 // Cancel the prerender associated with the prerender_handle_ 39 // Cancel the prerender associated with the prerender_handle_
40 void CancelCurrentPrerender(JNIEnv* env, jobject object); 40 void CancelCurrentPrerender(JNIEnv* env, jobject object);
41 41
42 // Whether the PrerenderManager associated with the given profile has any 42 // Whether the PrerenderManager associated with the given profile has any
43 // prerenders for the url. 43 // prerenders for the url.
44 static bool HasPrerenderedUrl(Profile* profile, 44 static bool HasPrerenderedUrl(Profile* profile,
45 GURL url, 45 GURL url,
46 content::WebContents* web_contents); 46 content::WebContents* web_contents);
47 47
48 // Whether the cookie store associated with this profile has been loaded.
49 static bool HasCookieStoreLoaded(Profile* profile);
50
48 static bool RegisterExternalPrerenderHandlerAndroid(JNIEnv* env); 51 static bool RegisterExternalPrerenderHandlerAndroid(JNIEnv* env);
49 52
50 private: 53 private:
51 virtual ~ExternalPrerenderHandlerAndroid(); 54 virtual ~ExternalPrerenderHandlerAndroid();
52 scoped_ptr<prerender::PrerenderHandle> prerender_handle_; 55 scoped_ptr<prerender::PrerenderHandle> prerender_handle_;
53 56
54 DISALLOW_COPY_AND_ASSIGN(ExternalPrerenderHandlerAndroid); 57 DISALLOW_COPY_AND_ASSIGN(ExternalPrerenderHandlerAndroid);
55 }; 58 };
56 59
57 } // namespace prerender 60 } // namespace prerender
58 61
59 #endif // CHROME_BROWSER_PRERENDER_EXTERNAL_PRERENDER_HANDLER_ANDROID_H_ 62 #endif // CHROME_BROWSER_PRERENDER_EXTERNAL_PRERENDER_HANDLER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698