chrome/browser/ui/webui/options/core_options_handler.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/webui/options/core_options_handler.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: 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

« no previous file with comments | « chrome/browser/ui/webui/net_internals/net_internals_ui.cc ('k') | chrome/browser/ui/webui/options/startup_pages_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/core_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc

index 9682bb956bf5cf0ace3357764c21e942331aa277..77a4acd3ef5dd189d4e6822fa5035288bc82f49f 100644

--- a/chrome/browser/ui/webui/options/core_options_handler.cc

+++ b/chrome/browser/ui/webui/options/core_options_handler.cc

@@ -23,7 +23,7 @@

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

#include "chrome/grit/locale_settings.h"

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

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

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

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

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

@@ -575,7 +575,7 @@ void CoreOptionsHandler::HandleSetPref(const base::ListValue* args,

NOTREACHED();

return;

}

- GURL fixed = url_fixer::FixupURL(original, std::string());

+ GURL fixed = url_formatter::FixupURL(original, std::string());

temp_value.reset(new base::StringValue(fixed.spec()));

value = temp_value.get();

break;