Index: chrome/browser/android/chrome_feature_list.cc |
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc |
index 35a046c636627172fea258c1daa4331bdfa42376..878f04da122967aba929d599771975de9caae68a 100644 |
--- a/chrome/browser/android/chrome_feature_list.cc |
+++ b/chrome/browser/android/chrome_feature_list.cc |
@@ -7,7 +7,6 @@ |
#include <string> |
#include "base/android/jni_string.h" |
-#include "base/feature_list.h" |
#include "jni/ChromeFeatureList_jni.h" |
using base::android::ConvertJavaStringToUTF8; |
@@ -17,10 +16,6 @@ namespace android { |
namespace { |
-const base::Feature kPhysicalWebFeature { |
- "PhysicalWeb", base::FEATURE_DISABLED_BY_DEFAULT |
-}; |
- |
// Array of features exposed through the Java ChromeFeatureList API. Entries in |
// this array may either refer to features defined in this file (above) or in |
// other locations in the code base (e.g. chrome/, components/, etc). |
@@ -30,6 +25,10 @@ const base::Feature* kFeaturesExposedToJava[] = { |
} // namespace |
+bool RegisterChromeFeatureListJni(JNIEnv* env) { |
+ return RegisterNativesImpl(env); |
+} |
+ |
static jboolean IsEnabled(JNIEnv* env, |
const JavaParamRef<jclass>& clazz, |
const JavaParamRef<jstring>& jfeature_name) { |
@@ -43,9 +42,9 @@ static jboolean IsEnabled(JNIEnv* env, |
return false; |
} |
-bool RegisterChromeFeatureListJni(JNIEnv* env) { |
- return RegisterNativesImpl(env); |
-} |
+const base::Feature kPhysicalWebFeature { |
Alexei Svitkine (slow)
2015/12/21 19:02:17
I meant to move this to below the anon namespace a
cco3
2015/12/21 19:21:00
Done.
|
+ "PhysicalWeb", base::FEATURE_DISABLED_BY_DEFAULT |
+}; |
} // namespace android |
} // namespace chrome |