Move collected cookies url constants into ChromeOS specific part.

Because they are only used in ChromeOS.

BUG=none.
TEST=Expect no change in build and behavior.

Review URL: http://codereview.chromium.org/6673046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78258 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 7 deletions

diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 7f5052d..141df13 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -79,7 +79,6 @@ const char kChromeUIAppLauncherURL[] = "chrome://newtab/#mode=app-launcher";
 const char kChromeUIBookmarksURL[] = "chrome://bookmarks/";
 const char kChromeUIBugReportURL[] = "chrome://bugreport/";
 const char kChromeUIConflictsURL[] = "chrome://conflicts/";
-const char kChromeUICollectedCookiesURL[] = "chrome://collected-cookies/";
 const char kChromeUIConstrainedHTMLTestURL[] = "chrome://constrained-test/";
 const char kChromeUICrashesURL[] = "chrome://crashes/";
 const char kChromeUIDevToolsURL[] = "chrome-devtools://devtools/";
@@ -102,6 +101,7 @@ const char kChromeUITextfieldsURL[] = "chrome://textfields/";
 const char kChromeUIAboutOSCreditsURL[] = "chrome://about/os-credits";
 const char kChromeUIActivationMessage[] = "chrome://activationmessage/";
 const char kChromeUIFileBrowseURL[] = "chrome://filebrowse/";
+const char kChromeUICollectedCookiesURL[] = "chrome://collected-cookies/";
 const char kChromeUIImageBurnerURL[] = "chrome://imageburner/";
 const char kChromeUIKeyboardOverlayURL[] = "chrome://keyboardoverlay/";
 const char kChromeUIMediaplayerURL[] = "chrome://mediaplayer/";
@@ -117,7 +117,6 @@ const char kChromeUIBookmarksHost[] = "bookmarks";
 const char kChromeUIBugReportHost[] = "bugreport";
 const char kChromeUIConflictsHost[] = "conflicts";
 const char kChromeUICrashesHost[] = "crashes";
-const char kChromeUICollectedCookiesHost[] = "collected-cookies";
 const char kChromeUIDevToolsHost[] = "devtools";
 const char kChromeUIDialogHost[] = "dialog";
 const char kChromeUIDownloadsHost[] = "downloads";
@@ -147,6 +146,7 @@ const char kChromeUIThumbnailPath[] = "thumb";
 
 #if defined(OS_CHROMEOS)
 const char kChromeUIActivationMessageHost[] = "activationmessage";
+const char kChromeUICollectedCookiesHost[] = "collected-cookies";
 const char kChromeUIFileBrowseHost[] = "filebrowse";
 const char kChromeUIImageBurnerHost[] = "imageburner";
 const char kChromeUIKeyboardOverlayHost[] = "keyboardoverlay";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 8c676a9..ae5c3da 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -71,7 +71,6 @@ extern const char kChromeUIAppLauncherURL[];
 extern const char kChromeUIBookmarksURL[];
 extern const char kChromeUIBugReportURL[];
 extern const char kChromeUIConflictsURL[];
-extern const char kChromeUICollectedCookiesURL[];
 extern const char kChromeUIConstrainedHTMLTestURL[];
 extern const char kChromeUICrashesURL[];
 extern const char kChromeUIDevToolsURL[];
@@ -93,6 +92,7 @@ extern const char kChromeUITextfieldsURL[];
 #if defined(OS_CHROMEOS)
 extern const char kChromeUIAboutOSCreditsURL[];
 extern const char kChromeUIActivationMessage[];
+extern const char kChromeUICollectedCookiesURL[];
 extern const char kChromeUIFileBrowseURL[];
 extern const char kChromeUIImageBurnerURL[];
 extern const char kChromeUIKeyboardOverlayURL[];
@@ -110,7 +110,6 @@ extern const char kChromeUIBookmarksHost[];
 extern const char kChromeUIBugReportHost[];
 extern const char kChromeUIConflictsHost[];
 extern const char kChromeUICrashesHost[];
-extern const char kChromeUICollectedCookiesHost[];
 extern const char kChromeUIDevToolsHost[];
 extern const char kChromeUIDialogHost[];
 extern const char kChromeUIDownloadsHost[];
@@ -139,6 +138,7 @@ extern const char kChromeUIThumbnailPath[];
 
 #if defined(OS_CHROMEOS)
 extern const char kChromeUIActivationMessageHost[];
+extern const char kChromeUICollectedCookiesHost[];
 extern const char kChromeUIFileBrowseHost[];
 extern const char kChromeUIImageBurnerHost[];
 extern const char kChromeUIKeyboardOverlayHost[];
diff --git a/content/browser/webui/web_ui_factory.cc b/content/browser/webui/web_ui_factory.cc
index 248de09..25b76e6 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)