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

Unified Diff: chrome/browser/about_flags.cc

Issue 9836103: Fix most remaining WebUI link errors on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: about_flags Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/prefs/browser_prefs.cc » ('j') | chrome/browser/sync/profile_sync_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index e635a104f094fcd29cf8360d0136fb1744a559e3..b2a5c5bb1ac31910ca409d95921f6f22e2b3e421 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -675,6 +675,9 @@ class FlagsState {
// Extracts the list of enabled lab experiments from preferences and stores them
// in a set.
void GetEnabledFlags(const PrefService* prefs, std::set<std::string>* result) {
+#if defined(OS_ANDROID)
+ NOTIMPLEMENTED() << "Experimental labs aren't supported on Android.";
Andrew T Wilson (Slow) 2012/03/27 17:33:16 I think it would be ideal if you could remove abou
Yaron 2012/03/27 19:06:52 Done.
+#else
const ListValue* enabled_experiments = prefs->GetList(
prefs::kEnabledLabsExperiments);
if (!enabled_experiments)
@@ -690,11 +693,15 @@ void GetEnabledFlags(const PrefService* prefs, std::set<std::string>* result) {
}
result->insert(experiment_name);
}
+#endif // #if defined(OS_ANDROID)
}
// Takes a set of enabled lab experiments
void SetEnabledFlags(
PrefService* prefs, const std::set<std::string>& enabled_experiments) {
+#if defined(OS_ANDROID)
+ NOTIMPLEMENTED() << "Experimental labs aren't supported on Android.";
+#else
ListPrefUpdate update(prefs, prefs::kEnabledLabsExperiments);
ListValue* experiments_list = update.Get();
@@ -704,6 +711,7 @@ void SetEnabledFlags(
++it) {
experiments_list->Append(new StringValue(*it));
}
+#endif // #if defined(OS_ANDROID)
}
// Returns the name used in prefs for the choice at the specified index.
« no previous file with comments | « no previous file | chrome/browser/prefs/browser_prefs.cc » ('j') | chrome/browser/sync/profile_sync_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698