chrome/browser/plugins/plugin_finder.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/plugins/plugin_finder.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/plugins/plugin_finder.cc

diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc

index b2fd197016a5dbb0b6553429229dd190a153c013..e51a2643f3f9e95e37726a33eb876135d6c8c76e 100644

--- a/chrome/browser/plugins/plugin_finder.cc

+++ b/chrome/browser/plugins/plugin_finder.cc

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

#include "base/json/json_reader.h"

#include "base/message_loop/message_loop.h"

#include "base/metrics/histogram_macros.h"

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

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

#include "base/stl_util.h"

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

@@ -19,6 +17,8 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/plugins/plugin_metadata.h"

#include "chrome/common/pref_names.h"

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

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

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

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

#include "grit/browser_resources.h"