Chromium Code Reviews| Index: chrome/browser/android/data_usage/data_use_tab_ui_manager_android.cc |
| diff --git a/chrome/browser/android/data_usage/data_use_tab_ui_manager_android.cc b/chrome/browser/android/data_usage/data_use_tab_ui_manager_android.cc |
| index cc69f75d8aa1147e711ffcaa98ef2d71a40b6781..f88614d5e27f11230afc2900e8fb87b83c7ca96e 100644 |
| --- a/chrome/browser/android/data_usage/data_use_tab_ui_manager_android.cc |
| +++ b/chrome/browser/android/data_usage/data_use_tab_ui_manager_android.cc |
| @@ -12,6 +12,7 @@ |
| #include "chrome/browser/android/data_usage/data_use_ui_tab_model_factory.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/profiles/profile_android.h" |
| +#include "components/sessions/core/session_id.h" |
| #include "jni/DataUseTabUIManager_jni.h" |
| // static |
| @@ -23,7 +24,8 @@ jboolean CheckDataUseTrackingStarted(JNIEnv* env, |
| chrome::android::DataUseUITabModel* data_use_ui_tab_model = |
| chrome::android::DataUseUITabModelFactory::GetForBrowserContext(profile); |
| if (data_use_ui_tab_model) |
| - return data_use_ui_tab_model->HasDataUseTrackingStarted(tab_id); |
| + return data_use_ui_tab_model->HasDataUseTrackingStarted( |
| + static_cast<SessionID::id_type>(tab_id)); |
|
sclittle
2015/11/30 22:33:38
nit: Could you DCHECK that |tab_id| is a valid >=0
tbansal1
2015/11/30 22:59:09
Done.
|
| return false; |
| } |
| @@ -36,7 +38,8 @@ jboolean CheckDataUseTrackingEnded(JNIEnv* env, |
| chrome::android::DataUseUITabModel* data_use_ui_tab_model = |
| chrome::android::DataUseUITabModelFactory::GetForBrowserContext(profile); |
| if (data_use_ui_tab_model) |
| - return data_use_ui_tab_model->HasDataUseTrackingEnded(tab_id); |
| + return data_use_ui_tab_model->HasDataUseTrackingEnded( |
| + static_cast<SessionID::id_type>(tab_id)); |
| return false; |
| } |
| @@ -52,7 +55,8 @@ void OnCustomTabInitialNavigation(JNIEnv* env, |
| chrome::android::DataUseUITabModelFactory::GetForBrowserContext(profile); |
| if (data_use_ui_tab_model) { |
| data_use_ui_tab_model->ReportCustomTabInitialNavigation( |
| - tab_id, ConvertJavaStringToUTF8(env, url), |
| + static_cast<SessionID::id_type>(tab_id), |
| + ConvertJavaStringToUTF8(env, url), |
| ConvertJavaStringToUTF8(env, package_name)); |
| } |
| } |