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/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
524 | 524 |
525 TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env, | 525 TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env, |
526 jobject obj, | 526 jobject obj, |
527 jstring url, | 527 jstring url, |
528 jstring j_extra_headers, | 528 jstring j_extra_headers, |
529 jbyteArray j_post_data, | 529 jbyteArray j_post_data, |
530 jint page_transition, | 530 jint page_transition, |
531 jstring j_referrer_url, | 531 jstring j_referrer_url, |
532 jint referrer_policy, | 532 jint referrer_policy, |
533 jboolean is_renderer_initiated, | 533 jboolean is_renderer_initiated, |
534 jlong intent_received_timestamp) { | 534 jlong intent_received_timestamp, |
| 535 jboolean has_user_gesture) { |
535 if (!web_contents()) | 536 if (!web_contents()) |
536 return PAGE_LOAD_FAILED; | 537 return PAGE_LOAD_FAILED; |
537 | 538 |
538 GURL gurl(base::android::ConvertJavaStringToUTF8(env, url)); | 539 GURL gurl(base::android::ConvertJavaStringToUTF8(env, url)); |
539 if (gurl.is_empty()) | 540 if (gurl.is_empty()) |
540 return PAGE_LOAD_FAILED; | 541 return PAGE_LOAD_FAILED; |
541 | 542 |
542 // If the page was prerendered, use it. | 543 // If the page was prerendered, use it. |
543 // Note in incognito mode, we don't have a PrerenderManager. | 544 // Note in incognito mode, we don't have a PrerenderManager. |
544 | 545 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
607 SearchTabHelper* search_tab_helper = | 608 SearchTabHelper* search_tab_helper = |
608 SearchTabHelper::FromWebContents(web_contents_.get()); | 609 SearchTabHelper::FromWebContents(web_contents_.get()); |
609 if (!search_terms.empty() && search_tab_helper && | 610 if (!search_terms.empty() && search_tab_helper && |
610 search_tab_helper->SupportsInstant()) { | 611 search_tab_helper->SupportsInstant()) { |
611 EmbeddedSearchRequestParams request_params(gurl); | 612 EmbeddedSearchRequestParams request_params(gurl); |
612 search_tab_helper->Submit(search_terms, request_params); | 613 search_tab_helper->Submit(search_terms, request_params); |
613 return DEFAULT_PAGE_LOAD; | 614 return DEFAULT_PAGE_LOAD; |
614 } | 615 } |
615 load_params.is_renderer_initiated = is_renderer_initiated; | 616 load_params.is_renderer_initiated = is_renderer_initiated; |
616 load_params.intent_received_timestamp = intent_received_timestamp; | 617 load_params.intent_received_timestamp = intent_received_timestamp; |
| 618 load_params.has_user_gesture = has_user_gesture; |
617 web_contents()->GetController().LoadURLWithParams(load_params); | 619 web_contents()->GetController().LoadURLWithParams(load_params); |
618 } | 620 } |
619 return DEFAULT_PAGE_LOAD; | 621 return DEFAULT_PAGE_LOAD; |
620 } | 622 } |
621 | 623 |
622 void TabAndroid::SetActiveNavigationEntryTitleForUrl(JNIEnv* env, | 624 void TabAndroid::SetActiveNavigationEntryTitleForUrl(JNIEnv* env, |
623 jobject obj, | 625 jobject obj, |
624 jstring jurl, | 626 jstring jurl, |
625 jstring jtitle) { | 627 jstring jtitle) { |
626 DCHECK(web_contents()); | 628 DCHECK(web_contents()); |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
878 // s^{n+1} / s^{n} = 2100 / 2000 | 880 // s^{n+1} / s^{n} = 2100 / 2000 |
879 // s = 1.05 | 881 // s = 1.05 |
880 // s^b = 60000 | 882 // s^b = 60000 |
881 // b = ln(60000) / ln(1.05) ~= 225 | 883 // b = ln(60000) / ln(1.05) ~= 225 |
882 UMA_HISTOGRAM_CUSTOM_TIMES("Startup.FirstCommitNavigationTime", | 884 UMA_HISTOGRAM_CUSTOM_TIMES("Startup.FirstCommitNavigationTime", |
883 base::Time::Now() - chrome::android::GetMainEntryPointTime(), | 885 base::Time::Now() - chrome::android::GetMainEntryPointTime(), |
884 base::TimeDelta::FromMilliseconds(1), | 886 base::TimeDelta::FromMilliseconds(1), |
885 base::TimeDelta::FromMinutes(1), | 887 base::TimeDelta::FromMinutes(1), |
886 225); | 888 225); |
887 } | 889 } |
OLD | NEW |