OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/data_usage/external_data_use_observer_bridge.h" | 5 #include "chrome/browser/android/data_usage/external_data_use_observer_bridge.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
| 10 #include "base/android/context_utils.h" |
10 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
11 #include "base/metrics/field_trial.h" | 12 #include "base/metrics/field_trial.h" |
12 #include "base/metrics/histogram_macros.h" | 13 #include "base/metrics/histogram_macros.h" |
13 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
14 #include "base/strings/string_number_conversions.h" | 15 #include "base/strings/string_number_conversions.h" |
15 #include "base/time/time.h" | 16 #include "base/time/time.h" |
16 #include "chrome/browser/android/data_usage/data_use_tab_model.h" | 17 #include "chrome/browser/android/data_usage/data_use_tab_model.h" |
17 #include "chrome/browser/android/data_usage/external_data_use_observer.h" | 18 #include "chrome/browser/android/data_usage/external_data_use_observer.h" |
18 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 19 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
19 #include "components/variations/variations_associated_data.h" | 20 #include "components/variations/variations_associated_data.h" |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 // |data_use_tab_model| is guaranteed to be non-null because this method is | 89 // |data_use_tab_model| is guaranteed to be non-null because this method is |
89 // called in the constructor of ExternalDataUseObserver. | 90 // called in the constructor of ExternalDataUseObserver. |
90 DCHECK(data_use_tab_model); | 91 DCHECK(data_use_tab_model); |
91 | 92 |
92 external_data_use_observer_ = external_data_use_observer; | 93 external_data_use_observer_ = external_data_use_observer; |
93 data_use_tab_model_ = data_use_tab_model->GetWeakPtr(); | 94 data_use_tab_model_ = data_use_tab_model->GetWeakPtr(); |
94 io_task_runner_ = io_task_runner; | 95 io_task_runner_ = io_task_runner; |
95 | 96 |
96 JNIEnv* env = base::android::AttachCurrentThread(); | 97 JNIEnv* env = base::android::AttachCurrentThread(); |
97 j_external_data_use_observer_.Reset(Java_ExternalDataUseObserver_create( | 98 j_external_data_use_observer_.Reset(Java_ExternalDataUseObserver_create( |
98 env, reinterpret_cast<intptr_t>(this))); | 99 env, base::android::GetApplicationContext(), |
| 100 reinterpret_cast<intptr_t>(this))); |
99 DCHECK(!j_external_data_use_observer_.is_null()); | 101 DCHECK(!j_external_data_use_observer_.is_null()); |
100 | 102 |
101 Java_ExternalDataUseObserver_initControlAppManager( | 103 Java_ExternalDataUseObserver_initControlAppManager( |
102 env, j_external_data_use_observer_, | 104 env, j_external_data_use_observer_, |
103 ConvertUTF8ToJavaString(env, GetControlAppPackageName())); | 105 ConvertUTF8ToJavaString(env, GetControlAppPackageName())); |
104 } | 106 } |
105 | 107 |
106 void ExternalDataUseObserverBridge::FetchMatchingRules() const { | 108 void ExternalDataUseObserverBridge::FetchMatchingRules() const { |
107 DCHECK(thread_checker_.CalledOnValidThread()); | 109 DCHECK(thread_checker_.CalledOnValidThread()); |
108 | 110 |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 register_google_variation_id_ = register_google_variation_id; | 237 register_google_variation_id_ = register_google_variation_id; |
236 } | 238 } |
237 | 239 |
238 bool RegisterExternalDataUseObserver(JNIEnv* env) { | 240 bool RegisterExternalDataUseObserver(JNIEnv* env) { |
239 return RegisterNativesImpl(env); | 241 return RegisterNativesImpl(env); |
240 } | 242 } |
241 | 243 |
242 } // namespace android | 244 } // namespace android |
243 | 245 |
244 } // namespace chrome | 246 } // namespace chrome |
OLD | NEW |