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/chrome_feature_list.h" | 5 #include "chrome/browser/android/chrome_feature_list.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
12 #include "base/feature_list.h" | 12 #include "base/feature_list.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "chrome/common/chrome_features.h" | 14 #include "chrome/common/chrome_features.h" |
15 #include "components/offline_pages/offline_page_feature.h" | 15 #include "components/offline_pages/offline_page_feature.h" |
16 #include "components/password_manager/core/common/password_manager_features.h" | |
16 #include "content/public/common/content_features.h" | 17 #include "content/public/common/content_features.h" |
17 #include "jni/ChromeFeatureList_jni.h" | 18 #include "jni/ChromeFeatureList_jni.h" |
18 | 19 |
19 using base::android::ConvertJavaStringToUTF8; | 20 using base::android::ConvertJavaStringToUTF8; |
20 | 21 |
21 namespace chrome { | 22 namespace chrome { |
22 namespace android { | 23 namespace android { |
23 | 24 |
24 namespace { | 25 namespace { |
25 | 26 |
26 // Array of features exposed through the Java ChromeFeatureList API. Entries in | 27 // Array of features exposed through the Java ChromeFeatureList API. Entries in |
27 // this array may either refer to features defined in the header of this file or | 28 // this array may either refer to features defined in the header of this file or |
28 // in other locations in the code base (e.g. chrome/, components/, etc). | 29 // in other locations in the code base (e.g. chrome/, components/, etc). |
29 const base::Feature* kFeaturesExposedToJava[] = { | 30 const base::Feature* kFeaturesExposedToJava[] = { |
30 &features::kAutoplayMutedVideos, | 31 &features::kAutoplayMutedVideos, |
31 &features::kCredentialManagementAPI, | 32 &features::kCredentialManagementAPI, |
32 &features::kSimplifiedFullscreenUI, | 33 &features::kSimplifiedFullscreenUI, |
34 &password_manager::features::kViewPasswords, | |
Bernhard Bauer
2016/07/19 11:46:50
Please keep these ordered alphabetically.
dozsa
2016/07/20 12:07:09
Done.
| |
33 &kAndroidPayIntegrationV1, | 35 &kAndroidPayIntegrationV1, |
34 &kImportantSitesInCBD, | 36 &kImportantSitesInCBD, |
35 &kNTPFakeOmniboxTextFeature, | 37 &kNTPFakeOmniboxTextFeature, |
36 &kNTPMaterialDesign, | 38 &kNTPMaterialDesign, |
37 &kNTPOfflinePagesFeature, | 39 &kNTPOfflinePagesFeature, |
38 &kNTPSnippetsFeature, | 40 &kNTPSnippetsFeature, |
39 &kNTPToolbarFeature, | 41 &kNTPToolbarFeature, |
40 &kPhysicalWebFeature, | 42 &kPhysicalWebFeature, |
41 &kPhysicalWebIgnoreOtherClientsFeature, | 43 &kPhysicalWebIgnoreOtherClientsFeature, |
42 &kReadItLaterInMenu, | 44 &kReadItLaterInMenu, |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
101 NOTREACHED(); | 103 NOTREACHED(); |
102 return false; | 104 return false; |
103 } | 105 } |
104 | 106 |
105 bool RegisterChromeFeatureListJni(JNIEnv* env) { | 107 bool RegisterChromeFeatureListJni(JNIEnv* env) { |
106 return RegisterNativesImpl(env); | 108 return RegisterNativesImpl(env); |
107 } | 109 } |
108 | 110 |
109 } // namespace android | 111 } // namespace android |
110 } // namespace chrome | 112 } // namespace chrome |
OLD | NEW |