Commit 0242380a authored by Tommy Steimel's avatar Tommy Steimel Committed by Commit Bot

Kaleidoscope: Move URL constants to webui_url_constants

This CL moves the Kaleidoscope URL constants into the public repo.

Bug: 1044741
Change-Id: I9fcc63929439f72acf2b8026710cddf35a34d53c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2048403Reviewed-by: default avatarBecca Hughes <beccahughes@chromium.org>
Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740317}
parent 3a2bcfd9
......@@ -99,10 +99,6 @@
#include "ui/web_dialogs/web_dialog_ui.h"
#include "url/gurl.h"
#if BUILDFLAG(ENABLE_KALEIDOSCOPE)
#include "chrome/browser/media/kaleidoscope/internal/constants.h"
#endif
#if BUILDFLAG(ENABLE_NACL)
#include "chrome/browser/ui/webui/nacl_ui.h"
#endif
......@@ -895,7 +891,7 @@ bool ChromeWebUIControllerFactory::IsWebUIAllowedToMakeNetworkRequests(
#if BUILDFLAG(ENABLE_KALEIDOSCOPE)
// TODO(https://crbug.com/1039904): This is only for prototyping purposes.
// Must be removed before launch.
origin.host() == kKaleidoscopeContentUIHost ||
origin.host() == chrome::kChromeUIKaleidoscopeContentHost ||
#endif
// https://crbug.com/831812
origin.host() == chrome::kChromeUISyncConfirmationHost ||
......
......@@ -91,6 +91,9 @@ const char kChromeUIInterstitialHost[] = "interstitials";
const char kChromeUIInterstitialURL[] = "chrome://interstitials/";
const char kChromeUIInterventionsInternalsHost[] = "interventions-internals";
const char kChromeUIInvalidationsHost[] = "invalidations";
const char kChromeUIKaleidoscopeHost[] = "kaleidoscope";
const char kChromeUIKaleidoscopeContentHost[] = "kaleidoscope-content";
const char kChromeUIKaleidoscopeContentURL[] = "chrome://kaleidoscope-content";
const char kChromeUIKillHost[] = "kill";
const char kChromeUILocalStateHost[] = "local-state";
const char kChromeUIManagementHost[] = "management";
......
......@@ -93,6 +93,9 @@ extern const char kChromeUIInterstitialHost[];
extern const char kChromeUIInterstitialURL[];
extern const char kChromeUIInterventionsInternalsHost[];
extern const char kChromeUIInvalidationsHost[];
extern const char kChromeUIKaleidoscopeHost[];
extern const char kChromeUIKaleidoscopeContentHost[];
extern const char kChromeUIKaleidoscopeContentURL[];
extern const char kChromeUIKillHost[];
extern const char kChromeUILocalStateHost[];
extern const char kChromeUIManagementHost[];
......
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