| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #include "chrome/browser/android/tab_android.h" | 5 #include "chrome/browser/android/tab_android.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 return PAGE_LOAD_FAILED; | 553 return PAGE_LOAD_FAILED; |
| 554 | 554 |
| 555 GURL gurl(base::android::ConvertJavaStringToUTF8(env, url)); | 555 GURL gurl(base::android::ConvertJavaStringToUTF8(env, url)); |
| 556 if (gurl.is_empty()) | 556 if (gurl.is_empty()) |
| 557 return PAGE_LOAD_FAILED; | 557 return PAGE_LOAD_FAILED; |
| 558 | 558 |
| 559 // If the page was prerendered, use it. | 559 // If the page was prerendered, use it. |
| 560 // Note in incognito mode, we don't have a PrerenderManager. | 560 // Note in incognito mode, we don't have a PrerenderManager. |
| 561 | 561 |
| 562 prerender::PrerenderManager* prerender_manager = | 562 prerender::PrerenderManager* prerender_manager = |
| 563 prerender::PrerenderManagerFactory::GetForProfile(GetProfile()); | 563 prerender::PrerenderManagerFactory::GetForBrowserContext(GetProfile()); |
| 564 if (prerender_manager) { | 564 if (prerender_manager) { |
| 565 bool prefetched_page_loaded = HasPrerenderedUrl(gurl); | 565 bool prefetched_page_loaded = HasPrerenderedUrl(gurl); |
| 566 // Getting the load status before MaybeUsePrerenderedPage() b/c it resets. | 566 // Getting the load status before MaybeUsePrerenderedPage() b/c it resets. |
| 567 chrome::NavigateParams params(web_contents()); | 567 chrome::NavigateParams params(web_contents()); |
| 568 InstantSearchPrerenderer* prerenderer = | 568 InstantSearchPrerenderer* prerenderer = |
| 569 InstantSearchPrerenderer::GetForProfile(GetProfile()); | 569 InstantSearchPrerenderer::GetForProfile(GetProfile()); |
| 570 if (prerenderer) { | 570 if (prerenderer) { |
| 571 const base::string16& search_terms = | 571 const base::string16& search_terms = |
| 572 search::ExtractSearchTermsFromURL(GetProfile(), gurl); | 572 search::ExtractSearchTermsFromURL(GetProfile(), gurl); |
| 573 if (!search_terms.empty() && | 573 if (!search_terms.empty() && |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 | 708 |
| 709 bitmap = gfx::ConvertToJavaBitmap(&favicon); | 709 bitmap = gfx::ConvertToJavaBitmap(&favicon); |
| 710 } | 710 } |
| 711 return bitmap; | 711 return bitmap; |
| 712 } | 712 } |
| 713 | 713 |
| 714 prerender::PrerenderManager* TabAndroid::GetPrerenderManager() const { | 714 prerender::PrerenderManager* TabAndroid::GetPrerenderManager() const { |
| 715 Profile* profile = GetProfile(); | 715 Profile* profile = GetProfile(); |
| 716 if (!profile) | 716 if (!profile) |
| 717 return NULL; | 717 return NULL; |
| 718 return prerender::PrerenderManagerFactory::GetForProfile(profile); | 718 return prerender::PrerenderManagerFactory::GetForBrowserContext(profile); |
| 719 } | 719 } |
| 720 | 720 |
| 721 // static | 721 // static |
| 722 void TabAndroid::CreateHistoricalTabFromContents(WebContents* web_contents) { | 722 void TabAndroid::CreateHistoricalTabFromContents(WebContents* web_contents) { |
| 723 DCHECK(web_contents); | 723 DCHECK(web_contents); |
| 724 | 724 |
| 725 sessions::TabRestoreService* service = | 725 sessions::TabRestoreService* service = |
| 726 TabRestoreServiceFactory::GetForProfile( | 726 TabRestoreServiceFactory::GetForProfile( |
| 727 Profile::FromBrowserContext(web_contents->GetBrowserContext())); | 727 Profile::FromBrowserContext(web_contents->GetBrowserContext())); |
| 728 if (!service) | 728 if (!service) |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 915 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 915 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 916 TRACE_EVENT0("native", "TabAndroid::Init"); | 916 TRACE_EVENT0("native", "TabAndroid::Init"); |
| 917 // This will automatically bind to the Java object and pass ownership there. | 917 // This will automatically bind to the Java object and pass ownership there. |
| 918 new TabAndroid(env, obj); | 918 new TabAndroid(env, obj); |
| 919 } | 919 } |
| 920 | 920 |
| 921 // static | 921 // static |
| 922 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { | 922 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { |
| 923 return RegisterNativesImpl(env); | 923 return RegisterNativesImpl(env); |
| 924 } | 924 } |
| OLD | NEW |