chrome/browser/chromeos/login/screens/reset_screen.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/chromeos/login/screens/reset_screen.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/chromeos/login/screens/reset_screen.cc

diff --git a/chrome/browser/chromeos/login/screens/reset_screen.cc b/chrome/browser/chromeos/login/screens/reset_screen.cc

index 223be55057d300bb8fa30e21f9db1f0fab9c1979..e24048fd991d491d0fb579793de5fa144466c716 100644

--- a/chrome/browser/chromeos/login/screens/reset_screen.cc

+++ b/chrome/browser/chromeos/login/screens/reset_screen.cc

@@ -6,8 +6,6 @@

#include "base/command_line.h"

#include "base/metrics/histogram.h"

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

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

#include "base/values.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"

@@ -22,6 +20,8 @@

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

#include "chromeos/dbus/session_manager_client.h"

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

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

namespace chromeos {