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

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

Issue 1847063005: [Media, UI] Change MediaNotification style to MediaStyle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed Mounir's comments, fixed time, origin and STOP_ACTION 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 "jni/ChromeFeatureList_jni.h" 16 #include "jni/ChromeFeatureList_jni.h"
17 17
18 using base::android::ConvertJavaStringToUTF8; 18 using base::android::ConvertJavaStringToUTF8;
19 19
20 namespace chrome { 20 namespace chrome {
21 namespace android { 21 namespace android {
22 22
23 namespace { 23 namespace {
24 24
25 // Array of features exposed through the Java ChromeFeatureList API. Entries in 25 // 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 26 // 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). 27 // other locations in the code base (e.g. chrome/, components/, etc).
28 const base::Feature* kFeaturesExposedToJava[] = { 28 const base::Feature* kFeaturesExposedToJava[] = {
29 &kMediaStyleNotification,
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,
36 }; 37 };
37 38
38 } // namespace 39 } // namespace
39 40
41 const base::Feature kMediaStyleNotification{
Bernhard Bauer 2016/04/14 12:58:20 Space before opening brace.
Zhiqiang Zhang (Slow) 2016/04/14 13:09:17 Done.
42 "MediaStyleNotification", base::FEATURE_DISABLED_BY_DEFAULT
43 };
44
40 const base::Feature kNTPOfflinePagesFeature { 45 const base::Feature kNTPOfflinePagesFeature {
41 "NTPOfflinePages", base::FEATURE_DISABLED_BY_DEFAULT 46 "NTPOfflinePages", base::FEATURE_DISABLED_BY_DEFAULT
42 }; 47 };
43 48
44 const base::Feature kNTPSnippetsFeature { 49 const base::Feature kNTPSnippetsFeature {
45 "NTPSnippets", base::FEATURE_DISABLED_BY_DEFAULT 50 "NTPSnippets", base::FEATURE_DISABLED_BY_DEFAULT
46 }; 51 };
47 52
48 const base::Feature kNTPToolbarFeature { 53 const base::Feature kNTPToolbarFeature {
49 "NTPToolbar", base::FEATURE_ENABLED_BY_DEFAULT 54 "NTPToolbar", base::FEATURE_ENABLED_BY_DEFAULT
(...skipping 23 matching lines...) Expand all
73 NOTREACHED(); 78 NOTREACHED();
74 return false; 79 return false;
75 } 80 }
76 81
77 bool RegisterChromeFeatureListJni(JNIEnv* env) { 82 bool RegisterChromeFeatureListJni(JNIEnv* env) {
78 return RegisterNativesImpl(env); 83 return RegisterNativesImpl(env);
79 } 84 }
80 85
81 } // namespace android 86 } // namespace android
82 } // namespace chrome 87 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698