| 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 void TabAndroid::OnFaviconAvailable(const gfx::Image& image) { | 388 void TabAndroid::OnFaviconAvailable(const gfx::Image& image) { |
| 389 SkBitmap favicon = image.AsImageSkia().GetRepresentation(1.0f).sk_bitmap(); | 389 SkBitmap favicon = image.AsImageSkia().GetRepresentation(1.0f).sk_bitmap(); |
| 390 if (favicon.empty()) | 390 if (favicon.empty()) |
| 391 return; | 391 return; |
| 392 | 392 |
| 393 JNIEnv *env = base::android::AttachCurrentThread(); | 393 JNIEnv *env = base::android::AttachCurrentThread(); |
| 394 Java_Tab_onFaviconAvailable(env, weak_java_tab_.get(env).obj(), | 394 Java_Tab_onFaviconAvailable(env, weak_java_tab_.get(env).obj(), |
| 395 gfx::ConvertToJavaBitmap(&favicon).obj()); | 395 gfx::ConvertToJavaBitmap(&favicon).obj()); |
| 396 } | 396 } |
| 397 | 397 |
| 398 void TabAndroid::OnFaviconUpdated(favicon::FaviconDriver* favicon_driver, |
| 399 bool icon_url_changed) { |
| 400 } |
| 401 |
| 398 void TabAndroid::Destroy(JNIEnv* env, jobject obj) { | 402 void TabAndroid::Destroy(JNIEnv* env, jobject obj) { |
| 399 delete this; | 403 delete this; |
| 400 } | 404 } |
| 401 | 405 |
| 402 void TabAndroid::InitWebContents(JNIEnv* env, | 406 void TabAndroid::InitWebContents(JNIEnv* env, |
| 403 jobject obj, | 407 jobject obj, |
| 404 jboolean incognito, | 408 jboolean incognito, |
| 405 jobject jcontent_view_core, | 409 jobject jcontent_view_core, |
| 406 jobject jweb_contents_delegate, | 410 jobject jweb_contents_delegate, |
| 407 jobject jcontext_menu_populator) { | 411 jobject jcontext_menu_populator) { |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 867 // s^{n+1} / s^{n} = 2100 / 2000 | 871 // s^{n+1} / s^{n} = 2100 / 2000 |
| 868 // s = 1.05 | 872 // s = 1.05 |
| 869 // s^b = 60000 | 873 // s^b = 60000 |
| 870 // b = ln(60000) / ln(1.05) ~= 225 | 874 // b = ln(60000) / ln(1.05) ~= 225 |
| 871 UMA_HISTOGRAM_CUSTOM_TIMES("Startup.FirstCommitNavigationTime", | 875 UMA_HISTOGRAM_CUSTOM_TIMES("Startup.FirstCommitNavigationTime", |
| 872 base::Time::Now() - chrome::android::GetMainEntryPointTime(), | 876 base::Time::Now() - chrome::android::GetMainEntryPointTime(), |
| 873 base::TimeDelta::FromMilliseconds(1), | 877 base::TimeDelta::FromMilliseconds(1), |
| 874 base::TimeDelta::FromMinutes(1), | 878 base::TimeDelta::FromMinutes(1), |
| 875 225); | 879 225); |
| 876 } | 880 } |
| OLD | NEW |