chrome/browser/ui/startup/startup_browser_creator.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/startup/startup_browser_creator.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/search_engines/edit_search_engine_controller.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.cc » ('j') | components/url_formatter/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc

index d654cc874e6a1a61ec78aa8d7ef7cc2154623540..99574507dd81c8a93ddebe41a1e13e2a7f5af9dd 100644

--- a/chrome/browser/ui/startup/startup_browser_creator.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator.cc

@@ -63,7 +63,7 @@

#include "components/google/core/browser/google_util.h"

#include "components/search_engines/util.h"

#include "components/signin/core/common/profile_management_switches.h"

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

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

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

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

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

@@ -475,7 +475,7 @@ std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine(

// 'about' if the browser was started with a about:foo argument.

if (!url.is_valid()) {

base::ThreadRestrictions::ScopedAllowIO allow_io;

- url = url_fixer::FixupRelativeFile(cur_dir, param);

+ url = url_formatter::FixupRelativeFile(cur_dir, param);

}

// Exclude dangerous schemes.

if (url.is_valid()) {