Change chrome:// to chrome-ui://, fix up one chrome-resource:// reference.

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

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

4 files changed, 11 insertions, 11 deletions

diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 08f000d..b73b19a 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -25,7 +25,7 @@
 
 // The URL scheme used for internal chrome resources.
 // TODO(glen): Choose a better location for this.
-static const char kChromeURLScheme[] = "chrome";
+static const char kChromeURLScheme[] = "chrome-ui";
 
 // The single global instance of ChromeURLDataManager.
 ChromeURLDataManager chrome_url_data_manager;
@@ -131,7 +131,7 @@ void ChromeURLDataManager::URLToRequest(const GURL& url,
     return;
   }
 
-  // Our input looks like: chrome://source_name/extra_bits?foo .
+  // Our input looks like: chrome-ui://source_name/extra_bits?foo .
   // So the url's "host" is our source, and everything after the host is
   // the path.
   source_name->assign(url.host());
diff --git a/chrome/browser/dom_ui/dom_ui_contents.cc b/chrome/browser/dom_ui/dom_ui_contents.cc
index a32a4cd..4e0a3f2 100644
--- a/chrome/browser/dom_ui/dom_ui_contents.cc
+++ b/chrome/browser/dom_ui/dom_ui_contents.cc
@@ -12,7 +12,7 @@
 
 // The scheme used for DOMUIContentses
 // TODO(glen): Merge this with the scheme in chrome_url_data_manager
-static const char kURLScheme[] = "chrome";
+static const char kURLScheme[] = "chrome-ui";
 
 // The path used in internal URLs to thumbnail data.
 static const char kThumbnailPath[] = "thumb";
@@ -117,9 +117,9 @@ void ThumbnailSource::OnThumbnailDataAvailable(
 ///////////////////////////////////////////////////////////////////////////////
 // DOMUIContents
 
-// This is the top-level URL handler for chrome: URLs, and exposed in
-// our header file. The individual DOMUIs provide a chrome:
-// HTML source at the same host/path.
+// This is the top-level URL handler for chrome-ui: URLs, and exposed in
+// our header file. The individual DOMUIs provide a chrome-ui:// HTML source
+// at the same host/path.
 bool DOMUIContentsCanHandleURL(GURL* url,
                                TabContentsType* result_type) {
   if (!url->SchemeIs(kURLScheme))
@@ -205,4 +205,5 @@ void DOMUIContents::ProcessDOMUIMessage(const std::string& message,
 // static
 const std::string DOMUIContents::GetScheme() {
   return kURLScheme;
-}
\ No newline at end of file
+}
+
diff --git a/chrome/browser/dom_ui/dom_ui_contents.h b/chrome/browser/dom_ui/dom_ui_contents.h
index 4712552..8042189 100644
--- a/chrome/browser/dom_ui/dom_ui_contents.h
+++ b/chrome/browser/dom_ui/dom_ui_contents.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Contains code for managing local HTML UI at chrome:// URLs.
+// Contains code for managing local HTML UI at chrome-ui:// URLs.
 
 #ifndef CHROME_BROWSER_DOM_UI_CONTENTS_H__
 #define CHROME_BROWSER_DOM_UI_CONTENTS_H__
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index c9226a7..da36fc7 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.cc
@@ -24,8 +24,7 @@
 
 using base::Time;
 
-// HistoryUI is accessible from chrome://history, and the raw HTML is
-// accessed from chrome://history.
+// HistoryUI is accessible from chrome-ui://history.
 static const char kHistoryHost[] = "history";
 
 // Maximum number of search results to return in a given search. We should 
@@ -287,7 +286,7 @@ void HistoryUI::Init() {
 
   HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource();
 
-  // Set up the chrome://history/ source.
+  // Set up the chrome-ui://history/ source.
   g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(&chrome_url_data_manager,
           &ChromeURLDataManager::AddDataSource,