chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm - Issue 1260033005: Revert of 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/toolbar/toolbar_controller.mm

Issue 1260033005: Revert of Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

index a5d5572468ba843aea2e474810a54396b187e874..2566d3144b7d5a1640d5d7b516a965df1c01522e 100644

--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

@@ -53,7 +53,7 @@

#include "components/omnibox/browser/autocomplete_classifier.h"

#include "components/omnibox/browser/autocomplete_match.h"

#include "components/search_engines/template_url_service.h"

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

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

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

#include "grit/theme_resources.h"

#import "ui/base/cocoa/menu_controller.h"

@@ -895,8 +895,8 @@

NOTIMPLEMENTED();

// Get the first URL and fix it up.

- GURL url(url_formatter::FixupURL(

- base::SysNSStringToUTF8([urls objectAtIndex:0]), std::string()));

+ GURL url(url_fixer::FixupURL(base::SysNSStringToUTF8([urls objectAtIndex:0]),

+ std::string()));

if (url.SchemeIs(url::kJavaScriptScheme)) {

browser_->window()->GetLocationBar()->GetOmniboxView()->SetUserText(