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