chrome/browser/ui/webui/settings_utils.cc - Issue 1841083005: Options: disallow bad URLs from being entered as startup pages

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/webui/settings_utils.cc

Issue 1841083005: Options: disallow bad URLs from being entered as startup pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@startup-browser-proxy

Patch Set: fixes Created 4 years, 8 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 unified diff | Download patch

« chrome/browser/ui/webui/options/startup_pages_handler.cc ('K') | « chrome/browser/ui/webui/settings_utils.h ('k') | chrome/browser/ui/webui/settings_utils_unittest.cc » ('j') | chrome/browser/ui/webui/settings_utils_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 // Copyright 2016 The Chromium Authors. All rights reserved.

	2 // Use of this source code is governed by a BSD-style license that can be

	3 // found in the LICENSE file.

	4

	5 #include "chrome/browser/ui/webui/settings_utils.h"

	6

	7 #include "chrome/browser/extensions/extension_tab_util.h"

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

	9 #include "url/gurl.h"

	10

	11 namespace settings_utils {

	12

	13 bool FixupAndValidateStartupPage(const std::string& url_string,

	14 GURL* url_fixed) {
	dpapad 2016/03/31 20:34:08 Nit: s/url_fixed/fixed_url, or change startup_page Nit: s/url_fixed/fixed_url, or change startup_pages_handler.cc the other way around. Dan Beam 2016/03/31 22:04:40 Done. Show quoted text On 2016/03/31 20:34:08, dpapad wrote: > Nit: s/url_fixed/fixed_url, or change startup_pages_handler.cc the other way > around. Done.
	15 GURL url = url_formatter::FixupURL(url_string, std::string());

	16 bool valid = url.is_valid() && !extensions::ExtensionTabUtil::IsKillURL(url);

	17 if (valid && url_fixed)

	18 url_fixed->Swap(&url);

	19 return valid;

	20 }

	21

	22 } // namespace settings_utils

OLD	NEW