OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/preferences/pref_service_bridge.h" | 5 #include "chrome/browser/android/preferences/pref_service_bridge.h" |
6 | 6 |
7 #include <jni.h> | 7 #include <jni.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 #include "content/public/browser/user_metrics.h" | 48 #include "content/public/browser/user_metrics.h" |
49 #include "jni/PrefServiceBridge_jni.h" | 49 #include "jni/PrefServiceBridge_jni.h" |
50 #include "ui/base/l10n/l10n_util.h" | 50 #include "ui/base/l10n/l10n_util.h" |
51 | 51 |
52 using base::android::AttachCurrentThread; | 52 using base::android::AttachCurrentThread; |
53 using base::android::CheckException; | 53 using base::android::CheckException; |
54 using base::android::ConvertJavaStringToUTF8; | 54 using base::android::ConvertJavaStringToUTF8; |
55 using base::android::ConvertUTF8ToJavaString; | 55 using base::android::ConvertUTF8ToJavaString; |
56 using base::android::ScopedJavaLocalRef; | 56 using base::android::ScopedJavaLocalRef; |
57 using base::android::ScopedJavaGlobalRef; | 57 using base::android::ScopedJavaGlobalRef; |
| 58 using browsing_data_counter_utils::BrowsingDataType; |
58 using content::BrowserThread; | 59 using content::BrowserThread; |
59 | 60 |
60 namespace { | 61 namespace { |
61 | 62 |
62 enum NetworkPredictionOptions { | 63 enum NetworkPredictionOptions { |
63 NETWORK_PREDICTION_ALWAYS, | 64 NETWORK_PREDICTION_ALWAYS, |
64 NETWORK_PREDICTION_WIFI_ONLY, | 65 NETWORK_PREDICTION_WIFI_ONLY, |
65 NETWORK_PREDICTION_NEVER, | 66 NETWORK_PREDICTION_NEVER, |
66 }; | 67 }; |
67 | 68 |
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 // ClearBrowsingDataObserver deletes itself when |browsing_data_remover| is | 548 // ClearBrowsingDataObserver deletes itself when |browsing_data_remover| is |
548 // done. | 549 // done. |
549 new ClearBrowsingDataObserver(env, obj, browsing_data_remover); | 550 new ClearBrowsingDataObserver(env, obj, browsing_data_remover); |
550 | 551 |
551 std::vector<int> data_types_vector; | 552 std::vector<int> data_types_vector; |
552 base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector); | 553 base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector); |
553 | 554 |
554 int remove_mask = 0; | 555 int remove_mask = 0; |
555 for (const int data_type : data_types_vector) { | 556 for (const int data_type : data_types_vector) { |
556 switch (static_cast<BrowsingDataType>(data_type)) { | 557 switch (static_cast<BrowsingDataType>(data_type)) { |
557 case HISTORY: | 558 case BrowsingDataType::HISTORY: |
558 remove_mask |= BrowsingDataRemover::REMOVE_HISTORY; | 559 remove_mask |= BrowsingDataRemover::REMOVE_HISTORY; |
559 break; | 560 break; |
560 case CACHE: | 561 case BrowsingDataType::CACHE: |
561 remove_mask |= BrowsingDataRemover::REMOVE_CACHE; | 562 remove_mask |= BrowsingDataRemover::REMOVE_CACHE; |
562 break; | 563 break; |
563 case COOKIES: | 564 case BrowsingDataType::COOKIES: |
564 remove_mask |= BrowsingDataRemover::REMOVE_COOKIES; | 565 remove_mask |= BrowsingDataRemover::REMOVE_COOKIES; |
565 remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA; | 566 remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA; |
566 break; | 567 break; |
567 case PASSWORDS: | 568 case BrowsingDataType::PASSWORDS: |
568 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS; | 569 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS; |
569 break; | 570 break; |
570 case FORM_DATA: | 571 case BrowsingDataType::FORM_DATA: |
571 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA; | 572 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA; |
572 break; | 573 break; |
573 default: | 574 default: |
574 NOTREACHED(); | 575 NOTREACHED(); |
575 } | 576 } |
576 } | 577 } |
577 | 578 |
578 browsing_data_remover->Remove(BrowsingDataRemover::Unbounded(), remove_mask, | 579 browsing_data_remover->Remove(BrowsingDataRemover::Unbounded(), remove_mask, |
579 BrowsingDataHelper::UNPROTECTED_WEB); | 580 BrowsingDataHelper::UNPROTECTED_WEB); |
580 } | 581 } |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1015 | 1016 |
1016 return ConvertJavaStringToUTF8(android_permission); | 1017 return ConvertJavaStringToUTF8(android_permission); |
1017 } | 1018 } |
1018 | 1019 |
1019 static void SetSupervisedUserId(JNIEnv* env, | 1020 static void SetSupervisedUserId(JNIEnv* env, |
1020 const JavaParamRef<jobject>& obj, | 1021 const JavaParamRef<jobject>& obj, |
1021 const JavaParamRef<jstring>& pref) { | 1022 const JavaParamRef<jstring>& pref) { |
1022 GetPrefService()->SetString(prefs::kSupervisedUserId, | 1023 GetPrefService()->SetString(prefs::kSupervisedUserId, |
1023 ConvertJavaStringToUTF8(env, pref)); | 1024 ConvertJavaStringToUTF8(env, pref)); |
1024 } | 1025 } |
OLD | NEW |