Commit 960a9872 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Split chrome/ WebUI constants into their own file.

Change-Id: Ied26e0a5eeed8ed2f4ca572f1d43bb27a126fa3a
Reviewed-on: https://chromium-review.googlesource.com/704020Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#510233}
parent 3a79b7c3
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
namespace { namespace {
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
// This list should be kept in sync with chrome/common/url_constants.h. // This list should be kept in sync with chrome/common/webui_url_constants.h.
// Only include useful sub-pages, confirmation alerts are not useful. // Only include useful sub-pages, confirmation alerts are not useful.
const char* const kChromeSettingsSubPages[] = { const char* const kChromeSettingsSubPages[] = {
chrome::kAutofillSubPage, chrome::kClearBrowserDataSubPage, chrome::kAutofillSubPage, chrome::kClearBrowserDataSubPage,
......
...@@ -323,7 +323,7 @@ std::string ChromeURLs() { ...@@ -323,7 +323,7 @@ std::string ChromeURLs() {
"<p>The following pages are for debugging purposes only. Because they " "<p>The following pages are for debugging purposes only. Because they "
"crash or hang the renderer, they're not linked directly; you can type " "crash or hang the renderer, they're not linked directly; you can type "
"them into the address bar if you need them.</p>\n<ul>"; "them into the address bar if you need them.</p>\n<ul>";
for (int i = 0; i < chrome::kNumberOfChromeDebugURLs; i++) for (size_t i = 0; i < chrome::kNumberOfChromeDebugURLs; i++)
html += "<li>" + std::string(chrome::kChromeDebugURLs[i]) + "</li>\n"; html += "<li>" + std::string(chrome::kChromeDebugURLs[i]) + "</li>\n";
html += "</ul>\n"; html += "</ul>\n";
AppendFooter(&html); AppendFooter(&html);
......
...@@ -191,6 +191,8 @@ static_library("common") { ...@@ -191,6 +191,8 @@ static_library("common") {
"url_constants.h", "url_constants.h",
"web_application_info.cc", "web_application_info.cc",
"web_application_info.h", "web_application_info.h",
"webui_url_constants.cc",
"webui_url_constants.h",
] ]
defines = [] defines = []
......
...@@ -34,7 +34,7 @@ per-file *.typemap=file://ipc/SECURITY_OWNERS ...@@ -34,7 +34,7 @@ per-file *.typemap=file://ipc/SECURITY_OWNERS
per-file *.mojom=set noparent per-file *.mojom=set noparent
per-file *.mojom=file://ipc/SECURITY_OWNERS per-file *.mojom=file://ipc/SECURITY_OWNERS
#Content settings # Content settings
per-file content_settings*=markusheintz@chromium.org per-file content_settings*=markusheintz@chromium.org
# Pepper files. # Pepper files.
...@@ -51,3 +51,7 @@ per-file crash_keys*=rsesek@chromium.org ...@@ -51,3 +51,7 @@ per-file crash_keys*=rsesek@chromium.org
per-file trace_event_args_whitelist*=nduca@chromium.org per-file trace_event_args_whitelist*=nduca@chromium.org
per-file trace_event_args_whitelist*=dsinclair@chromium.org per-file trace_event_args_whitelist*=dsinclair@chromium.org
per-file trace_event_args_whitelist*=oysteine@chromium.org per-file trace_event_args_whitelist*=oysteine@chromium.org
# WebUI. See also chrome/browser/ui/webui/OWNERS.
per-file webui_url_constants.cc=file://ui/webui/PLATFORM_OWNERS
per-file webui_url_constants.h=file://ui/webui/PLATFORM_OWNERS
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -60,7 +60,7 @@ bool CanImportURL(const GURL& url) { ...@@ -60,7 +60,7 @@ bool CanImportURL(const GURL& url) {
return true; return true;
} }
for (int i = 0; i < chrome::kNumberOfChromeDebugURLs; ++i) { for (size_t i = 0; i < chrome::kNumberOfChromeDebugURLs; ++i) {
if (fixed_url == chrome::kChromeDebugURLs[i]) if (fixed_url == chrome::kChromeDebugURLs[i])
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment