chrome/browser/bookmarks/bookmark_utils.cc - Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill.

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/bookmarks/bookmark_utils.cc

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pure merge of LKGR Created 7 years, 10 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/bookmarks/bookmark_prompt_prefs.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/bookmarks/bookmark_utils.cc

diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc

index 2e647ddf262aaaf43378455dc1a17785c39911af..398338900308115b3617f6dd78644139a067ab2a 100644

--- a/chrome/browser/bookmarks/bookmark_utils.cc

+++ b/chrome/browser/bookmarks/bookmark_utils.cc

@@ -19,9 +19,10 @@

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/bookmarks/bookmark_node_data.h"

#include "chrome/browser/history/query_parser.h"

-#include "chrome/browser/prefs/pref_registry_syncable.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/pref_names.h"

+#include "components/user_prefs/pref_registry_syncable.h"

+#include "components/user_prefs/user_prefs.h"

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

#include "net/base/net_util.h"

#include "ui/base/dragdrop/drag_drop_types.h"

@@ -134,7 +135,7 @@ int PreferredDropOperation(int source_operations, int operations) {

int BookmarkDragOperation(content::BrowserContext* browser_context,

const BookmarkNode* node) {

- PrefService* prefs = PrefServiceFromBrowserContext(browser_context);

+ PrefService* prefs = components::UserPrefs::Get(browser_context);

int move = ui::DragDropTypes::DRAG_MOVE;

if (!prefs->GetBoolean(prefs::kEditBookmarksEnabled))