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

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

Issue 6389002: Patch to restore 6267009 (move about:flags from profile to local state) (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 72357)
+++ chrome/browser/dom_ui/flags_ui.cc (working copy)
@@ -14,7 +14,6 @@
#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"
@@ -136,7 +135,7 @@
DictionaryValue results;
results.Set("flagsExperiments",
about_flags::GetFlagsExperimentsData(
- dom_ui_->GetProfile()->GetPrefs()));
+ g_browser_process->local_state()));
results.SetBoolean("needsRestart",
about_flags::IsRestartNeededToCommitChanges());
dom_ui_->CallJavascriptFunction(L"returnFlagsExperiments", results);
@@ -155,7 +154,7 @@
return;
about_flags::SetExperimentEnabled(
- dom_ui_->GetProfile()->GetPrefs(),
+ g_browser_process->local_state(),
experiment_internal_name,
enable_str == "true");
}
@@ -195,6 +194,6 @@
}
// static
-void FlagsUI::RegisterUserPrefs(PrefService* prefs) {
+void FlagsUI::RegisterPrefs(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