Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Side by Side Diff: chrome/browser/android/chrome_feature_list.cc

Issue 1877213003: [Smart Lock, UI] Fix dissapeared Auto-signin setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "content/public/common/content_features.h"
16 #include "jni/ChromeFeatureList_jni.h" 17 #include "jni/ChromeFeatureList_jni.h"
17 18
18 using base::android::ConvertJavaStringToUTF8; 19 using base::android::ConvertJavaStringToUTF8;
19 20
20 namespace chrome { 21 namespace chrome {
21 namespace android { 22 namespace android {
22 23
23 namespace { 24 namespace {
24 25
25 // Array of features exposed through the Java ChromeFeatureList API. Entries in 26 // Array of features exposed through the Java ChromeFeatureList API. Entries in
26 // this array may either refer to features defined in this file (above) or in 27 // this array may either refer to features defined in this file (above) or in
27 // other locations in the code base (e.g. chrome/, components/, etc). 28 // other locations in the code base (e.g. chrome/, components/, etc).
28 const base::Feature* kFeaturesExposedToJava[] = { 29 const base::Feature* kFeaturesExposedToJava[] = {
29 &kNTPOfflinePagesFeature, 30 &kNTPOfflinePagesFeature,
30 &kNTPSnippetsFeature, 31 &kNTPSnippetsFeature,
31 &kNTPToolbarFeature, 32 &kNTPToolbarFeature,
32 &kNTPFakeOmniboxTextFeature, 33 &kNTPFakeOmniboxTextFeature,
33 &kPhysicalWebFeature, 34 &kPhysicalWebFeature,
34 &features::kSimplifiedFullscreenUI, 35 &features::kSimplifiedFullscreenUI,
35 &offline_pages::kOfflinePagesBackgroundLoadingFeature, 36 &offline_pages::kOfflinePagesBackgroundLoadingFeature,
37 &features::kCredentialManagementAPI,
Bernhard Bauer 2016/04/13 14:23:01 Can we order these alphabetically before it become
melandory 2016/04/14 11:23:01 Done.
36 }; 38 };
37 39
38 } // namespace 40 } // namespace
39 41
40 const base::Feature kNTPOfflinePagesFeature { 42 const base::Feature kNTPOfflinePagesFeature {
41 "NTPOfflinePages", base::FEATURE_DISABLED_BY_DEFAULT 43 "NTPOfflinePages", base::FEATURE_DISABLED_BY_DEFAULT
42 }; 44 };
43 45
44 const base::Feature kNTPSnippetsFeature { 46 const base::Feature kNTPSnippetsFeature {
45 "NTPSnippets", base::FEATURE_DISABLED_BY_DEFAULT 47 "NTPSnippets", base::FEATURE_DISABLED_BY_DEFAULT
(...skipping 27 matching lines...) Expand all
73 NOTREACHED(); 75 NOTREACHED();
74 return false; 76 return false;
75 } 77 }
76 78
77 bool RegisterChromeFeatureListJni(JNIEnv* env) { 79 bool RegisterChromeFeatureListJni(JNIEnv* env) {
78 return RegisterNativesImpl(env); 80 return RegisterNativesImpl(env);
79 } 81 }
80 82
81 } // namespace android 83 } // namespace android
82 } // namespace chrome 84 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698