chrome/browser/ui/omnibox/omnibox_edit_model.cc - 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/omnibox/omnibox_edit_model.cc

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: Fold in secure_display to url_formatter Created 5 years, 5 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/content_settings/content_setting_bubble_model_unittest.cc ('k') | chrome/browser/ui/passwords/manage_passwords_view_utils.cc » ('j') | components/url_formatter/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/omnibox/omnibox_edit_model.cc

diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc

index 89a6265d316e5e8d3c02d395e00b86e423fa9964..f9ce07f136e1e5106c7ef3829de4378a148ebf33 100644

--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc

+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc

@@ -52,7 +52,7 @@

#include "components/search_engines/template_url.h"

#include "components/search_engines/template_url_prepopulate_data.h"

#include "components/search_engines/template_url_service.h"

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

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

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

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

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

@@ -321,7 +321,8 @@ bool OmniboxEditModel::UpdatePermanentText() {

}

GURL OmniboxEditModel::PermanentURL() {

- return url_fixer::FixupURL(base::UTF16ToUTF8(permanent_text_), std::string());

+ return url_formatter::FixupURL(base::UTF16ToUTF8(permanent_text_),

+ std::string());

}

void OmniboxEditModel::SetUserText(const base::string16& text) {