diff options
author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 04:21:16 +0000 |
---|---|---|
committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 04:21:16 +0000 |
commit | 60e4489819cec6689927c88a4d6114c388fe89fb (patch) | |
tree | 68c0f7f657bee7020e3bb2922b64b86f93070e61 /chrome/browser/dom_ui | |
parent | f76b3b04a4c092d7db4cc2a75da4ca7fbac1f620 (diff) | |
download | chromium_src-60e4489819cec6689927c88a4d6114c388fe89fb.zip chromium_src-60e4489819cec6689927c88a4d6114c388fe89fb.tar.gz chromium_src-60e4489819cec6689927c88a4d6114c388fe89fb.tar.bz2 |
Change chrome-ui to chrome. I didn't go too far in converting existing strings to using the url_constant (shipshipship).
Users (such as those on Beta and Dev using session restore) attempting to load the old pages will see a blank white screen.
BUG=11272
TEST=Verify that the inspector, debugger, history, downloads and newtab pages load with chrome:// URLS. Verify that replacing the chrome:// with chrome-ui:// does not work.
Review URL: http://codereview.chromium.org/101026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r-- | chrome/browser/dom_ui/chrome_url_data_manager.cc | 6 | ||||
-rw-r--r-- | chrome/browser/dom_ui/downloads_ui.cc | 2 | ||||
-rw-r--r-- | chrome/browser/dom_ui/history_ui.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc index 230efd8..7fadbed 100644 --- a/chrome/browser/dom_ui/chrome_url_data_manager.cc +++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc @@ -30,7 +30,7 @@ // The URL scheme used for internal chrome resources. // TODO(glen): Choose a better location for this. -static const char kChromeURLScheme[] = "chrome-ui"; +static const char kChromeURLScheme[] = "chrome"; // The single global instance of ChromeURLDataManager. ChromeURLDataManager chrome_url_data_manager; @@ -105,7 +105,7 @@ void RegisterURLRequestChromeJob() { if (PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir)) { // TODO(yurys): remove "inspector" source when new developer tools support // all features of in-process Web Inspector and Console Debugger. For the - // time being we need to serve the same content from chrome-ui://inspector + // time being we need to serve the same content from chrome://inspector // for the Console Debugger and in-process Web Inspector. chrome_url_data_manager.AddFileSource("inspector", inspector_dir); chrome_url_data_manager.AddFileSource(chrome::kChromeUIDevToolsHost, @@ -145,7 +145,7 @@ void ChromeURLDataManager::URLToRequest(const GURL& url, return; } - // Our input looks like: chrome-ui://source_name/extra_bits?foo . + // Our input looks like: chrome://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/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc index 8c33825..c8c7a06 100644 --- a/chrome/browser/dom_ui/downloads_ui.cc +++ b/chrome/browser/dom_ui/downloads_ui.cc @@ -518,7 +518,7 @@ DownloadsUI::DownloadsUI(TabContents* contents) : DOMUI(contents) { DownloadsUIHTMLSource* html_source = new DownloadsUIHTMLSource(); - // Set up the chrome-ui://downloads/ source. + // Set up the chrome://downloads/ source. g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(&chrome_url_data_manager, &ChromeURLDataManager::AddDataSource, diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index 74f0f25..1c37d12 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -367,7 +367,7 @@ HistoryUI::HistoryUI(TabContents* contents) : DOMUI(contents) { HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource(); - // Set up the chrome-ui://history/ source. + // Set up the chrome://history/ source. g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(&chrome_url_data_manager, &ChromeURLDataManager::AddDataSource, |