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

Unified Diff: chrome/browser/dom_ui/flags_ui.cc

Issue 6262010: Revert 72225 - This patch moves the experiments settings from the user profil... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | « chrome/browser/dom_ui/flags_ui.h ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/flags_ui.cc
===================================================================
--- chrome/browser/dom_ui/flags_ui.cc (revision 72270)
+++ chrome/browser/dom_ui/flags_ui.cc (working copy)
@@ -14,6 +14,7 @@
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
@@ -135,7 +136,7 @@
DictionaryValue results;
results.Set("flagsExperiments",
about_flags::GetFlagsExperimentsData(
- g_browser_process->local_state()));
+ dom_ui_->GetProfile()->GetPrefs()));
results.SetBoolean("needsRestart",
about_flags::IsRestartNeededToCommitChanges());
dom_ui_->CallJavascriptFunction(L"returnFlagsExperiments", results);
@@ -154,7 +155,7 @@
return;
about_flags::SetExperimentEnabled(
- g_browser_process->local_state(),
+ dom_ui_->GetProfile()->GetPrefs(),
experiment_internal_name,
enable_str == "true");
}
@@ -194,6 +195,6 @@
}
// static
-void FlagsUI::RegisterPrefs(PrefService* local_state) {
- local_state->RegisterListPref(prefs::kEnabledLabsExperiments);
+void FlagsUI::RegisterUserPrefs(PrefService* prefs) {
+ prefs->RegisterListPref(prefs::kEnabledLabsExperiments);
}
« no previous file with comments | « chrome/browser/dom_ui/flags_ui.h ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698