Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(578)

Unified Diff: content/browser/webui/web_ui_factory.cc

Issue 6673046: Move collected cookies url constants into ChromeOS specific part. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 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/common/url_constants.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webui/web_ui_factory.cc
diff --git a/content/browser/webui/web_ui_factory.cc b/content/browser/webui/web_ui_factory.cc
index 248de09bb99d89f0e6ee24ceb9b3072e263d79d5..25b76e6b488e26e0e329057bc0d3e9babd4009e9 100644
--- a/content/browser/webui/web_ui_factory.cc
+++ b/content/browser/webui/web_ui_factory.cc
@@ -95,10 +95,8 @@ WebUI* NewWebUI<ExtensionWebUI>(TabContents* contents, const GURL& url) {
// when invoked for a particular tab - see NewWebUI<ExtensionWebUI>.
static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
const GURL& url) {
- if (url.host() == chrome::kChromeUIDialogHost ||
- url.host() == chrome::kChromeUICollectedCookiesHost) {
+ if (url.host() == chrome::kChromeUIDialogHost)
return &NewWebUI<ConstrainedHtmlUI>;
- }
ExtensionService* service = profile ? profile->GetExtensionService() : NULL;
if (service && service->ExtensionBindingsAllowed(url))
@@ -182,6 +180,8 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
#endif
#if defined(OS_CHROMEOS)
+ if (url.host() == chrome::kChromeUICollectedCookiesHost)
+ return &NewWebUI<ConstrainedHtmlUI>;
if (url.host() == chrome::kChromeUIFileBrowseHost)
return &NewWebUI<FileBrowseUI>;
if (url.host() == chrome::kChromeUIImageBurnerHost)
« no previous file with comments | « chrome/common/url_constants.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698