chrome/browser/extensions/api/bookmarks/bookmarks_api.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/extensions/api/bookmarks/bookmarks_api.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/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc ('k') | chrome/browser/extensions/api/commands/command_service.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

index 3c501f3c61dd86d97d66cf6374b47d3aaf498261..64e7da564777d4dbbbc7fa65ccbb12baa0f606a9 100644

--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

@@ -39,6 +39,7 @@

#include "chrome/common/chrome_paths.h"

#include "chrome/common/extensions/api/bookmarks.h"

#include "chrome/common/pref_names.h"

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

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

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

@@ -116,7 +117,7 @@ bool BookmarksFunction::GetBookmarkIdAsInt64(const std::string& id_string,

}

bool BookmarksFunction::EditBookmarksEnabled() {

- PrefService* prefs = PrefServiceFromBrowserContext(profile_);

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

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

return true;

error_ = keys::kEditBookmarksDisabled;

@@ -431,7 +432,7 @@ bool BookmarksSearchFunction::RunImpl() {

bookmarks::Search::Params::Create(*args_));

EXTENSION_FUNCTION_VALIDATE(params.get());

- PrefService* prefs = PrefServiceFromBrowserContext(profile_);

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

std::string lang = prefs->GetString(prefs::kAcceptLanguages);

std::vector<const BookmarkNode*> nodes;

bookmark_utils::GetBookmarksContainingText(