summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 04:21:16 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 04:21:16 +0000
commit60e4489819cec6689927c88a4d6114c388fe89fb (patch)
tree68c0f7f657bee7020e3bb2922b64b86f93070e61 /chrome/browser/tab_contents
parentf76b3b04a4c092d7db4cc2a75da4ca7fbac1f620 (diff)
downloadchromium_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/tab_contents')
-rw-r--r--chrome/browser/tab_contents/render_view_context_menu.cc2
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc4
-rw-r--r--chrome/browser/tab_contents/web_contents_unittest.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 8c5e862..bde8749 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -239,7 +239,7 @@ bool RenderViewContextMenu::IsItemCommandEnabled(int id) const {
// in a new tab as they should. Disabling this context menu option for
// now, as a quick hack, before we resolve this issue (Issue = 2608).
// TODO (sidchat): Enable this option once this issue is resolved.
- if (params_.image_url.scheme() == "chrome-ui")
+ if (params_.image_url.scheme() == chrome::kChromeUIScheme)
return false;
return true;
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 38c6d19..d673f43 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -1919,8 +1919,8 @@ void TabContents::RequestOpenURL(const GURL& url, const GURL& referrer,
// generated suggestions).
//
// Note also that we hide the referrer for DOM UI pages. We don't really
- // want web sites to see a referrer of "chrome-ui://blah" (and some
- // chrome-ui URLs might have search terms or other stuff we don't want to
+ // want web sites to see a referrer of "chrome://blah" (and some
+ // chrome: URLs might have search terms or other stuff we don't want to
// send to the site), so we send no referrer.
OpenURL(url, GURL(), disposition,
render_manager_.dom_ui()->link_transition_type());
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index a2fd641..e9367e6 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -214,7 +214,7 @@ TEST_F(TabContentsTest, UpdateTitle) {
// Test view source mode for the new tabs page.
TEST_F(TabContentsTest, NTPViewSource) {
- const char kUrl[] = "view-source:chrome-ui://newtab/";
+ const char kUrl[] = "view-source:chrome://newtab/";
const GURL kGURL(kUrl);
process()->sink().ClearMessages();