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

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

Issue 1962063002: Revert of Update NTP to new material design spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « chrome/browser/android/chrome_feature_list.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 14 matching lines...) Expand all
25 25
26 // Array of features exposed through the Java ChromeFeatureList API. Entries in 26 // Array of features exposed through the Java ChromeFeatureList API. Entries in
27 // 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
28 // other locations in the code base (e.g. chrome/, components/, etc). 28 // other locations in the code base (e.g. chrome/, components/, etc).
29 const base::Feature* kFeaturesExposedToJava[] = { 29 const base::Feature* kFeaturesExposedToJava[] = {
30 &features::kCredentialManagementAPI, 30 &features::kCredentialManagementAPI,
31 &features::kSimplifiedFullscreenUI, 31 &features::kSimplifiedFullscreenUI,
32 &kImportantSitesInCBD, 32 &kImportantSitesInCBD,
33 &kMediaStyleNotification, 33 &kMediaStyleNotification,
34 &kNTPFakeOmniboxTextFeature, 34 &kNTPFakeOmniboxTextFeature,
35 &kNTPMaterialDesign,
36 &kNTPOfflinePagesFeature, 35 &kNTPOfflinePagesFeature,
37 &kNTPSnippetsFeature, 36 &kNTPSnippetsFeature,
38 &kNTPToolbarFeature, 37 &kNTPToolbarFeature,
39 &kPhysicalWebFeature, 38 &kPhysicalWebFeature,
40 &offline_pages::kOfflinePagesBackgroundLoadingFeature, 39 &offline_pages::kOfflinePagesBackgroundLoadingFeature,
41 }; 40 };
42 41
43 } // namespace 42 } // namespace
44 43
45 const base::Feature kImportantSitesInCBD{"ImportantSitesInCBD", 44 const base::Feature kImportantSitesInCBD{"ImportantSitesInCBD",
46 base::FEATURE_DISABLED_BY_DEFAULT}; 45 base::FEATURE_DISABLED_BY_DEFAULT};
47 46
48 const base::Feature kMediaStyleNotification { 47 const base::Feature kMediaStyleNotification {
49 "MediaStyleNotification", base::FEATURE_DISABLED_BY_DEFAULT 48 "MediaStyleNotification", base::FEATURE_DISABLED_BY_DEFAULT
50 }; 49 };
51 50
52 const base::Feature kNTPMaterialDesign{"NTPMaterialDesign",
53 base::FEATURE_ENABLED_BY_DEFAULT};
54
55 const base::Feature kNTPOfflinePagesFeature { 51 const base::Feature kNTPOfflinePagesFeature {
56 "NTPOfflinePages", base::FEATURE_DISABLED_BY_DEFAULT 52 "NTPOfflinePages", base::FEATURE_DISABLED_BY_DEFAULT
57 }; 53 };
58 54
59 const base::Feature kNTPSnippetsFeature { 55 const base::Feature kNTPSnippetsFeature {
60 "NTPSnippets", base::FEATURE_DISABLED_BY_DEFAULT 56 "NTPSnippets", base::FEATURE_DISABLED_BY_DEFAULT
61 }; 57 };
62 58
63 const base::Feature kNTPToolbarFeature { 59 const base::Feature kNTPToolbarFeature {
64 "NTPToolbar", base::FEATURE_ENABLED_BY_DEFAULT 60 "NTPToolbar", base::FEATURE_ENABLED_BY_DEFAULT
(...skipping 23 matching lines...) Expand all
88 NOTREACHED(); 84 NOTREACHED();
89 return false; 85 return false;
90 } 86 }
91 87
92 bool RegisterChromeFeatureListJni(JNIEnv* env) { 88 bool RegisterChromeFeatureListJni(JNIEnv* env) {
93 return RegisterNativesImpl(env); 89 return RegisterNativesImpl(env);
94 } 90 }
95 91
96 } // namespace android 92 } // namespace android
97 } // namespace chrome 93 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_feature_list.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698