OLD | NEW |
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 #include "chrome/browser/android/tab_android.h" | 5 #include "chrome/browser/android/tab_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 | 463 |
464 TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env, | 464 TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env, |
465 jobject obj, | 465 jobject obj, |
466 jstring url, | 466 jstring url, |
467 jstring j_extra_headers, | 467 jstring j_extra_headers, |
468 jbyteArray j_post_data, | 468 jbyteArray j_post_data, |
469 jint page_transition, | 469 jint page_transition, |
470 jstring j_referrer_url, | 470 jstring j_referrer_url, |
471 jint referrer_policy, | 471 jint referrer_policy, |
472 jboolean is_renderer_initiated) { | 472 jboolean is_renderer_initiated) { |
473 content::ContentViewCore* content_view = GetContentViewCore(); | 473 if (!web_contents()) |
474 if (!content_view) | |
475 return PAGE_LOAD_FAILED; | 474 return PAGE_LOAD_FAILED; |
476 | 475 |
477 GURL gurl(base::android::ConvertJavaStringToUTF8(env, url)); | 476 GURL gurl(base::android::ConvertJavaStringToUTF8(env, url)); |
478 if (gurl.is_empty()) | 477 if (gurl.is_empty()) |
479 return PAGE_LOAD_FAILED; | 478 return PAGE_LOAD_FAILED; |
480 | 479 |
481 // If the page was prerendered, use it. | 480 // If the page was prerendered, use it. |
482 // Note in incognito mode, we don't have a PrerenderManager. | 481 // Note in incognito mode, we don't have a PrerenderManager. |
483 | 482 |
484 prerender::PrerenderManager* prerender_manager = | 483 prerender::PrerenderManager* prerender_manager = |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 const base::string16 search_terms = | 556 const base::string16 search_terms = |
558 chrome::ExtractSearchTermsFromURL(GetProfile(), gurl); | 557 chrome::ExtractSearchTermsFromURL(GetProfile(), gurl); |
559 SearchTabHelper* search_tab_helper = | 558 SearchTabHelper* search_tab_helper = |
560 SearchTabHelper::FromWebContents(web_contents_.get()); | 559 SearchTabHelper::FromWebContents(web_contents_.get()); |
561 if (!search_terms.empty() && search_tab_helper && | 560 if (!search_terms.empty() && search_tab_helper && |
562 search_tab_helper->SupportsInstant()) { | 561 search_tab_helper->SupportsInstant()) { |
563 search_tab_helper->Submit(search_terms); | 562 search_tab_helper->Submit(search_terms); |
564 return DEFAULT_PAGE_LOAD; | 563 return DEFAULT_PAGE_LOAD; |
565 } | 564 } |
566 load_params.is_renderer_initiated = is_renderer_initiated; | 565 load_params.is_renderer_initiated = is_renderer_initiated; |
567 content_view->LoadUrl(load_params); | 566 web_contents()->GetController().LoadURLWithParams(load_params); |
568 } | 567 } |
569 return DEFAULT_PAGE_LOAD; | 568 return DEFAULT_PAGE_LOAD; |
570 } | 569 } |
571 | 570 |
572 ToolbarModel::SecurityLevel TabAndroid::GetSecurityLevel(JNIEnv* env, | 571 ToolbarModel::SecurityLevel TabAndroid::GetSecurityLevel(JNIEnv* env, |
573 jobject obj) { | 572 jobject obj) { |
574 return ToolbarModelImpl::GetSecurityLevelForWebContents(web_contents()); | 573 return ToolbarModelImpl::GetSecurityLevelForWebContents(web_contents()); |
575 } | 574 } |
576 | 575 |
577 void TabAndroid::SetActiveNavigationEntryTitleForUrl(JNIEnv* env, | 576 void TabAndroid::SetActiveNavigationEntryTitleForUrl(JNIEnv* env, |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
661 | 660 |
662 static void Init(JNIEnv* env, jobject obj) { | 661 static void Init(JNIEnv* env, jobject obj) { |
663 TRACE_EVENT0("native", "TabAndroid::Init"); | 662 TRACE_EVENT0("native", "TabAndroid::Init"); |
664 // This will automatically bind to the Java object and pass ownership there. | 663 // This will automatically bind to the Java object and pass ownership there. |
665 new TabAndroid(env, obj); | 664 new TabAndroid(env, obj); |
666 } | 665 } |
667 | 666 |
668 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { | 667 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { |
669 return RegisterNativesImpl(env); | 668 return RegisterNativesImpl(env); |
670 } | 669 } |
OLD | NEW |