chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm - Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode

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 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix typo in elide_url.cc Created 4 years, 8 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

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 82305ab109daa1db0142f4d4fc70ea0e2c61a2aa..571d7b3f56ec9683bbaf43ed9000ad45c6ec4975 100644

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

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

@@ -10,7 +10,6 @@

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

#include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"

#include "components/bookmarks/browser/bookmark_model.h"

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

#include "components/url_formatter/url_fixer.h"

#include "components/user_prefs/user_prefs.h"

@@ -66,11 +65,8 @@ using bookmarks::BookmarkNode;

// from an "Add Page..." item in a context menu.

if (node_) {

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

- PrefService* prefs = [self profile] ?

- user_prefs::UserPrefs::Get([self profile]) :

- NULL;

base::string16 urlString =

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

+ chrome::FormatBookmarkURLForDisplay(node_->url());

initialUrl_.reset([base::SysUTF16ToNSString(urlString) retain]);

} else {

GURL url = [self url];

« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/status_bubble_mac.h » ('j') | no next file with comments »