chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm - Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components

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 1171333003: Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase again now that CQ is fixed Created 5 years, 4 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 079e5095b75fb56e640092588e6848ce5cdf0ca9..ec02dac9b6dcf703b4319ba274ea827bb2320d0e 100644

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

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

@@ -11,7 +11,7 @@

#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/url_fixer/url_fixer.h"

+#include "components/url_formatter/url_fixer.h"

#include "components/user_prefs/user_prefs.h"

using bookmarks::BookmarkExpandedStateTracker;

@@ -104,7 +104,7 @@ using bookmarks::BookmarkNode;

// If possible, return a valid GURL from the URL text field.

- (GURL)GURLFromUrlField {

NSString* url = [self displayURL];

- return url_fixer::FixupURL([url UTF8String], std::string());

+ return url_formatter::FixupURL([url UTF8String], std::string());

}

// Enable the OK button if there is a valid URL.

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