chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm - 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/ui/cocoa/bookmarks/bookmark_editor_controller.mm

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/ui/browser_ui_prefs.cc ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm

index c689ac9d80769250b16330a163334c8cb04a0ef5..46226e7a5341a4ea40da1723873abf896d4a3e75 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm

@@ -13,6 +13,7 @@

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

#include "chrome/browser/ui/bookmarks/bookmark_utils.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_cell_single_line.h"

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

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

@interface BookmarkEditorController (Private)

@@ -70,7 +71,7 @@

if (node_) {

[self setInitialName:base::SysUTF16ToNSString(node_->GetTitle())];

PrefService* prefs = [self profile] ?

- PrefServiceFromBrowserContext([self profile]) :

+ components::UserPrefs::Get([self profile]) :

NULL;

string16 urlString =

chrome::FormatBookmarkURLForDisplay(node_->url(), prefs);