summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsimonhatch@chromium.org <simonhatch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-22 20:26:25 +0000
committersimonhatch@chromium.org <simonhatch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-22 20:26:25 +0000
commit1a087e074b59e50878533783b9d201a29f033dc3 (patch)
tree8b17d89f52c9f001e7456d6c1eba9e22ac153b7c
parent6b15d66d37af8b643e41715b9280dfda13f3bef6 (diff)
downloadchromium_src-1a087e074b59e50878533783b9d201a29f033dc3.zip
chromium_src-1a087e074b59e50878533783b9d201a29f033dc3.tar.gz
chromium_src-1a087e074b59e50878533783b9d201a29f033dc3.tar.bz2
Navigation transitions: Add finch trial for navigation transitions.
Thought it would be nice to keep this feature disabled by default behind the experimental flag, but be able to potentially turn it on via a finch trial from chrome. Needs to land first: https://codereview.chromium.org/386943009/ BUG=370696 Review URL: https://codereview.chromium.org/389583004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284762 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/child/runtime_features.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index bcdc8c7..99598ae 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -13,6 +13,7 @@
#if defined(OS_ANDROID)
#include <cpu-features.h>
#include "base/android/build_info.h"
+#include "base/metrics/field_trial.h"
#include "media/base/android/media_codec_bridge.h"
#endif
@@ -53,6 +54,11 @@ static void SetRuntimeFeatureDefaultsForPlatform() {
WebRuntimeFeatures::enableOrientationEvent(true);
WebRuntimeFeatures::enableFastMobileScrolling(true);
WebRuntimeFeatures::enableMediaCapture(true);
+ // If navigation transitions gets activated via field trial, enable it in
+ // blink. We don't set this to false in case the user has manually enabled
+ // the feature via experimental web platform features.
+ if (base::FieldTrialList::FindFullName("NavigationTransitions") == "Enabled")
+ WebRuntimeFeatures::enableNavigationTransitions(true);
#else
WebRuntimeFeatures::enableNavigatorContentUtils(true);
#endif // defined(OS_ANDROID)