chrome/browser/ui/webui/settings/reset_settings_handler.cc - Issue 1658793002: Update chrome for new prefs location.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/settings/reset_settings_handler.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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:

Index: chrome/browser/ui/webui/settings/reset_settings_handler.cc

diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc

index 50f42b44ea8c0681e8fe51e81e15d05be5294913..9a6e28fa2dd413f694f78c8ba4614e37f4a3ad7a 100644

--- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc

+++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc

@@ -9,7 +9,6 @@

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/metrics/histogram.h"

-#include "base/prefs/pref_service.h"

#include "base/strings/string16.h"

#include "base/time/time.h"

#include "base/values.h"

@@ -25,12 +24,12 @@

#include "chrome/common/url_constants.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

+#include "components/prefs/pref_service.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/browser/web_ui.h"

#include "content/public/browser/web_ui_data_source.h"

#if defined(OS_CHROMEOS)

-#include "base/prefs/pref_service.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_process_platform_part.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

@@ -38,6 +37,7 @@

#include "chrome/common/pref_names.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

+#include "components/prefs/pref_service.h"

#include "components/user_manager/user_manager.h"

#endif // defined(OS_CHROMEOS)