chrome/browser/supervised_user/supervised_user_bookmarks_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/supervised_user/supervised_user_bookmarks_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: 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/ssl/captive_portal_blocking_page.cc ('k') | chrome/browser/supervised_user/supervised_user_url_filter.cc » ('j') | components/url_formatter/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc

diff --git a/chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc b/chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc

index feaeb61bf24977a80fe1ce1f922fefd17aaa3eeb..2b35d142850c063e06d36626a6413da0cd3e7b1d 100644

--- a/chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc

+++ b/chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc

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

#include "base/logging.h"

#include "base/strings/string_number_conversions.h"

#include "base/values.h"

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

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

namespace {

@@ -187,7 +187,7 @@ void SupervisedUserBookmarksHandler::AddFoldersToTree() {

void SupervisedUserBookmarksHandler::AddLinksToTree() {

for (const auto& link : links_) {

scoped_ptr<base::DictionaryValue> node(new base::DictionaryValue);

- GURL url = url_fixer::FixupURL(link.url, std::string());

+ GURL url = url_formatter::FixupURL(link.url, std::string());

if (!url.is_valid()) {

LOG(WARNING) << "Got invalid URL: " << link.url;

continue;