diff options
26 files changed, 74 insertions, 70 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 662671e..96fa213 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -76,7 +76,7 @@ ChromeURLDataManager::DataSource* about_source = NULL; // time that about memory is being computed. std::string GetAboutMemoryRedirectResponse() { return "<meta http-equiv=\"refresh\" " - "content=\"0;chrome-ui://about/memory\">"; + "content=\"0;chrome://about/memory\">"; } class AboutSource : public ChromeURLDataManager::DataSource { @@ -612,20 +612,20 @@ bool WillHandleBrowserAboutURL(GURL* url) { // Special case about:memory to go through a redirect before ending up on // the final page. See GetAboutMemoryRedirectResponse above for why. if (LowerCaseEqualsASCII(url->path(), kMemoryPath)) { - *url = GURL("chrome-ui://about/memory-redirect"); + *url = GURL("chrome://about/memory-redirect"); return true; } - // Rewrite the about URL to use chrome-ui. WebKit treats all about URLS the + // Rewrite the about URL to use chrome:. WebKit treats all about URLS the // same (blank page), so if we want to display content, we need another // scheme. - std::string about_url = "chrome-ui://about/"; + std::string about_url = "chrome://about/"; about_url.append(url->path()); *url = GURL(about_url); return true; } -// This function gets called with the fixed-up chrome-ui URLs, so we have to +// This function gets called with the fixed-up chrome: URLs, so we have to // compare against those instead of "about:blah". bool HandleNonNavigationAboutURL(const GURL& url) { // About:network and IPC and currently buggy, so we disable it for official diff --git a/chrome/browser/browser_about_handler.h b/chrome/browser/browser_about_handler.h index 3a46bb0..dedf929 100644 --- a/chrome/browser/browser_about_handler.h +++ b/chrome/browser/browser_about_handler.h @@ -11,7 +11,7 @@ class GURL; // Decides whether the given URL will be handled by the browser about handler // and returns true if so. On true, it may also modify the given URL to be the -// final form (we fix up most "about:" URLs to be "chrome-ui:" because WebKit +// final form (we fix up most "about:" URLs to be "chrome:" because WebKit // handles all "about:" URLs as "about:blank. // // This is used by BrowserURLHandler. diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index defd7b7..9a3b00d 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -519,7 +519,7 @@ int BrowserMain(const MainFunctionParams& parameters) { // Config the network module so it has access to resources. net::NetModule::SetResourceProvider(NetResourceProvider); - // Register our global network handler for chrome-ui:// and + // Register our global network handler for chrome:// and // chrome-extension:// URLs. RegisterURLRequestChromeJob(); diff --git a/chrome/browser/browser_url_handler.cc b/chrome/browser/browser_url_handler.cc index c309c01..e42e34e 100644 --- a/chrome/browser/browser_url_handler.cc +++ b/chrome/browser/browser_url_handler.cc @@ -36,7 +36,7 @@ void BrowserURLHandler::InitURLHandlers() { // Add the default URL handlers. url_handlers_.push_back(&WillHandleBrowserAboutURL); // about: - url_handlers_.push_back(&HandleDOMUI); // chrome-ui: & friends. + url_handlers_.push_back(&HandleDOMUI); // chrome: & friends. url_handlers_.push_back(&HandleViewSource); // view-source: } diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc index cfd53a8..fb09551 100644 --- a/chrome/browser/debugger/debugger_view.cc +++ b/chrome/browser/debugger/debugger_view.cc @@ -21,6 +21,7 @@ #include "chrome/browser/view_ids.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/browser/views/tab_contents_container_view.h" +#include "chrome/common/url_constants.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/scrollbar/native_scroll_bar.h" #include "chrome/views/controls/scroll_view.h" @@ -104,7 +105,8 @@ void DebuggerView::OnInit() { web_container_->SetTabContents(tab_contents_); tab_contents_->render_view_host()->AllowDOMUIBindings(); - GURL contents("chrome-ui://inspector/debugger.html"); + GURL contents(std::string(chrome::kChromeUIScheme) + + "//inspector/debugger.html"); tab_contents_->controller().LoadURL(contents, GURL(), PageTransition::START_PAGE); } diff --git a/chrome/browser/debugger/devtools_view.cc b/chrome/browser/debugger/devtools_view.cc index 34cbb20..7a9e59f 100644 --- a/chrome/browser/debugger/devtools_view.cc +++ b/chrome/browser/debugger/devtools_view.cc @@ -54,7 +54,7 @@ void DevToolsView::Init() { web_container_->SetTabContents(tab_contents_); tab_contents_->render_view_host()->AllowDOMUIBindings(); - // chrome-ui://devtools/devtools.html + // chrome://devtools/devtools.html GURL contents(std::string(chrome::kChromeUIDevToolsURL) + "devtools.html"); // this will call CreateRenderView to create renderer process 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, diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 9d1dfcb..3aa0480 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -180,7 +180,7 @@ ExtensionsUI::ExtensionsUI(TabContents* contents) : DOMUI(contents) { ExtensionsUIHTMLSource* html_source = new ExtensionsUIHTMLSource(); - // Set up the chrome-ui://extensions/ source. + // Set up the chrome://extensions/ source. g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(&chrome_url_data_manager, &ChromeURLDataManager::AddDataSource, html_source)); diff --git a/chrome/browser/renderer_host/renderer_security_policy.cc b/chrome/browser/renderer_host/renderer_security_policy.cc index ae78380..c455c7e 100644 --- a/chrome/browser/renderer_host/renderer_security_policy.cc +++ b/chrome/browser/renderer_host/renderer_security_policy.cc @@ -196,8 +196,8 @@ void RendererSecurityPolicy::GrantInspectElement(int renderer_id) { if (state == security_state_.end()) return; - // The inspector is served from a chrome-ui: URL. In order to run the - // inspector, the renderer needs to be able to load chrome-ui URLs. + // The inspector is served from a chrome: URL. In order to run the + // inspector, the renderer needs to be able to load chrome: URLs. state->second->GrantScheme(chrome::kChromeUIScheme); } @@ -210,7 +210,7 @@ void RendererSecurityPolicy::GrantDOMUIBindings(int renderer_id) { state->second->GrantDOMUIBindings(); - // DOM UI bindings need the ability to request chrome-ui URLs. + // DOM UI bindings need the ability to request chrome: URLs. state->second->GrantScheme(chrome::kChromeUIScheme); // DOM UI pages can contain links to file:// URLs. diff --git a/chrome/browser/renderer_host/renderer_security_policy_unittest.cc b/chrome/browser/renderer_host/renderer_security_policy_unittest.cc index 464abc8..2144229 100644 --- a/chrome/browser/renderer_host/renderer_security_policy_unittest.cc +++ b/chrome/browser/renderer_host/renderer_security_policy_unittest.cc @@ -16,12 +16,12 @@ class RendererSecurityPolicyTest : public testing::Test { protected: // testing::Test virtual void SetUp() { - // In the real world, "chrome-ui" is a handled scheme. - URLRequest::RegisterProtocolFactory("chrome-ui", + // In the real world, "chrome:" is a handled scheme. + URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme, &URLRequestTestJob::Factory); } virtual void TearDown() { - URLRequest::RegisterProtocolFactory("chrome-ui", NULL); + URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme, NULL); } }; @@ -74,7 +74,7 @@ TEST_F(RendererSecurityPolicyTest, StandardSchemesTest) { EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("view-cache:http://www.google.com/"))); EXPECT_FALSE(p->CanRequestURL(kRendererID, - GURL("chrome-ui://foo/bar"))); + GURL("chrome://foo/bar"))); p->Remove(kRendererID); } @@ -212,7 +212,7 @@ TEST_F(RendererSecurityPolicyTest, CanUploadFiles) { TEST_F(RendererSecurityPolicyTest, CanServiceInspectElement) { RendererSecurityPolicy* p = RendererSecurityPolicy::GetInstance(); - GURL url("chrome-ui://inspector/inspector.html"); + GURL url("chrome://inspector/inspector.html"); p->Add(kRendererID); @@ -226,7 +226,7 @@ TEST_F(RendererSecurityPolicyTest, CanServiceInspectElement) { TEST_F(RendererSecurityPolicyTest, CanServiceDOMUIBindings) { RendererSecurityPolicy* p = RendererSecurityPolicy::GetInstance(); - GURL url("chrome-ui://thumb/http://www.google.com/"); + GURL url("chrome://thumb/http://www.google.com/"); p->Add(kRendererID); diff --git a/chrome/browser/resources/downloads.html b/chrome/browser/resources/downloads.html index b451503..a6cd273 100644 --- a/chrome/browser/resources/downloads.html +++ b/chrome/browser/resources/downloads.html @@ -501,7 +501,7 @@ Download.prototype.update = function(download) { this.danger_.style.display = 'block'; this.safe_.style.display = 'none'; } else { - this.nodeImg_.src = 'chrome-ui://fileicon/' + this.filePath_; + this.nodeImg_.src = 'chrome://fileicon/' + this.filePath_; if (this.state_ == Download.States.COMPLETE) { this.nodeFileLink_.innerHTML = this.fileName_; diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html index c9ecac7..8a3195e 100644 --- a/chrome/browser/resources/history.html +++ b/chrome/browser/resources/history.html @@ -127,7 +127,7 @@ Page.prototype.getTitleDOM_ = function() { var link = document.createElement('a'); link.href = this.url_; link.style.backgroundImage = - 'url(chrome-ui://favicon/' + encodeURIForCSS(this.url_) + ')'; + 'url(chrome://favicon/' + encodeURIForCSS(this.url_) + ')'; link.appendChild(document.createTextNode(this.title_)); this.highlightNodeContent_(link); @@ -553,7 +553,7 @@ HistoryView.prototype.displayNavBar_ = function() { */ HistoryView.prototype.createPageNavHTML_ = function(page, name) { var hashString = PageState.getHashString(this.model_.getSearchText(), page); - return '<a href="chrome-ui://history/' + + return '<a href="chrome://history/' + (hashString ? '#' + hashString : '') + '"' + 'class="page-navigation"' + diff --git a/chrome/browser/resources/new_tab.html b/chrome/browser/resources/new_tab.html index 586d1cf..67fad50 100644 --- a/chrome/browser/resources/new_tab.html +++ b/chrome/browser/resources/new_tab.html @@ -180,7 +180,7 @@ html[dir='rtl'] #mostvisited td { -webkit-transition:all 0.12s; } .thumbnail-title { - background-image:url(chrome-ui://favicon/); + background-image:url(chrome://favicon/); display:block; background-repeat:no-repeat; background-size:16px; @@ -377,8 +377,8 @@ document.addEventListener('DOMContentLoaded', handleDOMContentLoaded); <div id="mostvisitedsection" class="section"> <div id="mostvisited" style="position:relative;"> <div> - <span class="section-title non-edit-visible" jscontent="mostvisited"></span> - <span class="section-title edit-visible" jseval="this.innerHTML = $this.editmodeheading;"></span> + <span class="section-title non-edit-visible" jscontent="mostvisited"></span> + <span class="section-title edit-visible" jseval="this.innerHTML = $this.editmodeheading;"></span> </div> <div id="mostvisitedintro" style="display:none;"> <div class="most-visited-text" style="position:absolute;" jseval="this.innerHTML = $this.mostvisitedintro;"></div> @@ -422,9 +422,9 @@ document.addEventListener('DOMContentLoaded', handleDOMContentLoaded); onClick="enterEditMode(); return false"> <span jscontent="editthumbnails"></span></a> <button type="button" class="edit-visible" onClick="exitEditMode();" - jscontent="doneediting"></button> + jscontent="doneediting"></button> <button type="button" class="edit-visible" onClick="cancelEdits();" - jscontent="cancelediting"></button> + jscontent="cancelediting"></button> <a href="#" class="manage edit-visible" onClick="restoreThumbnails(); return false"> @@ -448,7 +448,7 @@ document.addEventListener('DOMContentLoaded', handleDOMContentLoaded); <form onsubmit="chrome.send('searchHistoryPage', [this.search.value]); return false;"> <input type="text" class="hint" name="search" - style="background-image:url(chrome-ui://favicon/);" + style="background-image:url(chrome://favicon/);" jsvalues="placeholder:searchhistory"> </form> <div id='searches-entries'></div> @@ -513,7 +513,7 @@ function makeMostVisitedDOM(page, number) { <div class="thumbnail-title disabled-on-edit" style="background-image:url(faviconurl);direction:ltr">gmail.com</div> <img class="thumbnail disabled-on-edit" - style="background-image:url(thumbnailurl);" /> + style="background-image:url(thumbnailurl);" /> </a> */ var root; @@ -532,12 +532,12 @@ function makeMostVisitedDOM(page, number) { /* Create the thumbnail */ var img_thumbnail = DOM('img', {className:'thumbnail disabled-on-edit'}); img_thumbnail.setAttribute('onload', "logEvent('image loaded');"); - img_thumbnail.src = 'chrome-ui://thumb/' + page.url; + img_thumbnail.src = 'chrome://thumb/' + page.url; /* Create the title */ var div_title = DOM('div', {className:'thumbnail-title disabled-on-edit'}); div_title.style.backgroundImage = - 'url("chrome-ui://favicon/' + page.url + '")'; + 'url("chrome://favicon/' + page.url + '")'; /* Set the title's directionality independently of the overall page directionality. We need to do this since a purely LTR title should always have it's direction set as ltr. We only set the title direction to rtl if @@ -634,7 +634,7 @@ function makeSearchURL(url) { /* The HTML we want looks like this: <form> <input type="text" class="hint" - style="background-image:url(chrome-ui://favicon/"+url+");" + style="background-image:url(chrome://favicon/"+url+");" placeholder="Search Wikipedia"> </form> */ @@ -646,10 +646,10 @@ function makeSearchURL(url) { if (url.favIconURL) { input.style.backgroundImage = - 'url("chrome-ui://favicon/iconurl/' + url.favIconURL + '")'; + 'url("chrome://favicon/iconurl/' + url.favIconURL + '")'; } else { input.style.backgroundImage = - 'url("chrome-ui://favicon/http://' + url.short_name + '")'; + 'url("chrome://favicon/http://' + url.short_name + '")'; } var form = DOM('form'); @@ -701,7 +701,7 @@ function renderRecentlyBookmarked(entries) { chrome.send("metrics", ["NTP_Bookmark" + i]) }, false); link.style.backgroundImage = - 'url("chrome-ui://favicon/' + entry.url + '")'; + 'url("chrome://favicon/' + entry.url + '")'; /* Set the bookmark title's directionality independently of the page, see comment about setting div_title.style.direction above for details. */ @@ -753,7 +753,7 @@ function renderRecentlyClosedTabs(entries) { for (var windowIndex = 0; windowIndex < entry.tabs.length; windowIndex++) { var tab = entry.tabs[windowIndex]; var tabImg = DOM('img', { - src:'url("chrome-ui://favicon/' + tab.url + '")', + src:'url("chrome://favicon/' + tab.url + '")', width:16, height:16}); tabImg.onmousedown = function() { return false; } @@ -814,7 +814,7 @@ function createRecentBookmark(tagName, data) { var link = DOM(tagName, {className:'recent-bookmark', title:data.title}); if (tagName == 'a') link.href = data.url; - link.style.backgroundImage = 'url("chrome-ui://favicon/' + data.url + '")'; + link.style.backgroundImage = 'url("chrome://favicon/' + data.url + '")'; /* Set the title's directionality independently of the page, see comment about setting div_title.style.direction above for details. */ 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(); diff --git a/chrome/common/extensions/url_pattern.h b/chrome/common/extensions/url_pattern.h index 4778016..c1ad52c 100644 --- a/chrome/common/extensions/url_pattern.h +++ b/chrome/common/extensions/url_pattern.h @@ -10,7 +10,7 @@ // subset of URL syntax: // // <url-pattern> := <scheme>://<host><path> -// <scheme> := 'http' | 'https' | 'file' | 'ftp' | 'chrome-ui' +// <scheme> := 'http' | 'https' | 'file' | 'ftp' | 'chrome' // <host> := '*' | '*.' <anychar except '/' and '*'>+ // <path> := '/' <any chars> // @@ -21,7 +21,7 @@ // - http://*/* // - http://*/foo* // - https://*.google.com/foo*bar -// - chrome-ui://foo/bar +// - chrome://foo/bar // - file://monkey* // - http://127.0.0.1/* // diff --git a/chrome/common/extensions/url_pattern_unittest.cc b/chrome/common/extensions/url_pattern_unittest.cc index b53fc07..3db623f 100644 --- a/chrome/common/extensions/url_pattern_unittest.cc +++ b/chrome/common/extensions/url_pattern_unittest.cc @@ -70,13 +70,13 @@ TEST(URLPatternTest, Match3) { // odd schemes and normalization TEST(URLPatternTest, Match4) { URLPattern pattern; - EXPECT_TRUE(pattern.Parse("chrome-ui://thinger/*")); - EXPECT_EQ("chrome-ui", pattern.scheme()); + EXPECT_TRUE(pattern.Parse("chrome://thinger/*")); + EXPECT_EQ("chrome", pattern.scheme()); EXPECT_EQ("thinger", pattern.host()); EXPECT_FALSE(pattern.match_subdomains()); EXPECT_EQ("/*", pattern.path()); - EXPECT_TRUE(pattern.MatchesUrl(GURL("chrome-ui://thinger/foobar"))); - EXPECT_TRUE(pattern.MatchesUrl(GURL("CHROME-UI://thinger/"))); + EXPECT_TRUE(pattern.MatchesUrl(GURL("chrome://thinger/foobar"))); + EXPECT_TRUE(pattern.MatchesUrl(GURL("CHROME://thinger/"))); EXPECT_FALSE(pattern.MatchesUrl(GURL("http://thinger/"))); } diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 5b7e8a9..e8c9416 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -11,7 +11,7 @@ namespace chrome { const char kAboutScheme[] = "about"; const char kChromeInternalScheme[] = "chrome-internal"; -const char kChromeUIScheme[] = "chrome-ui"; +const char kChromeUIScheme[] = "chrome"; const char kDataScheme[] = "data"; const char kExtensionScheme[] = "chrome-extension"; const char kFileScheme[] = "file"; @@ -31,14 +31,14 @@ const char kAboutBlankURL[] = "about:blank"; const char kAboutCacheURL[] = "about:cache"; const char kAboutMemoryURL[] = "about:memory"; -const char kChromeUIDevToolsURL[] = "chrome-ui://devtools/"; -const char kChromeUIDownloadsURL[] = "chrome-ui://downloads/"; -const char kChromeUIExtensionsURL[] = "chrome-ui://extensions/"; -const char kChromeUIHistoryURL[] = "chrome-ui://history/"; -const char kChromeUIInspectorURL[] = "chrome-ui://inspector/"; -const char kChromeUIIPCURL[] = "chrome-ui://about/ipc"; -const char kChromeUINetworkURL[] = "chrome-ui://about/network"; -const char kChromeUINewTabURL[] = "chrome-ui://newtab"; +const char kChromeUIDevToolsURL[] = "chrome://devtools/"; +const char kChromeUIDownloadsURL[] = "chrome://downloads/"; +const char kChromeUIExtensionsURL[] = "chrome://extensions/"; +const char kChromeUIHistoryURL[] = "chrome://history/"; +const char kChromeUIInspectorURL[] = "chrome://inspector/"; +const char kChromeUIIPCURL[] = "chrome://about/ipc"; +const char kChromeUINetworkURL[] = "chrome://about/network"; +const char kChromeUINewTabURL[] = "chrome://newtab"; const char kChromeUIDevToolsHost[] = "devtools"; const char kChromeUIDialogHost[] = "dialog"; diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index 163d2da..21dff62 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -34,7 +34,7 @@ extern const char kAboutBlankURL[]; extern const char kAboutCacheURL[]; extern const char kAboutMemoryURL[]; -// chrome-ui: URLs (including schemes). Should be kept in sync with the +// chrome: URLs (including schemes). Should be kept in sync with the // components below. extern const char kChromeUIDevToolsURL[]; extern const char kChromeUIDownloadsURL[]; @@ -45,7 +45,7 @@ extern const char kChromeUIInspectorURL[]; extern const char kChromeUINetworkURL[]; extern const char kChromeUINewTabURL[]; -// chrome-ui components of URLs. Should be kept in sync with the full URLs +// chrome components of URLs. Should be kept in sync with the full URLs // above. extern const char kChromeUIDevToolsHost[]; extern const char kChromeUIDialogHost[]; diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 7bf055e..11b3cb0 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -317,9 +317,9 @@ void RenderThread::EnsureWebKitInitialized() { webkit_client_.reset(new RendererWebKitClientImpl); WebKit::initialize(webkit_client_.get()); - // chrome-ui pages should not be accessible by normal content, and should + // chrome: pages should not be accessible by normal content, and should // also be unable to script anything but themselves (to help limit the damage - // that a corrupt chrome-ui page could cause). + // that a corrupt chrome: page could cause). WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme)); WebKit::registerURLSchemeAsLocal(chrome_ui_scheme); WebKit::registerURLSchemeAsNoAccess(chrome_ui_scheme); diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 3e62e11..d173537 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -137,7 +137,7 @@ static int32 next_page_id_ = 1; static const int kMaximumNumberOfUnacknowledgedPopups = 25; static const char* const kUnreachableWebDataURL = - "chrome-ui://chromewebdata/"; + "chrome://chromewebdata/"; static const char* const kBackForwardNavigationScheme = "history"; diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc index d9a1ced..8403746 100644 --- a/chrome/renderer/render_view_unittest.cc +++ b/chrome/renderer/render_view_unittest.cc @@ -23,7 +23,7 @@ TEST_F(RenderViewTest, OnLoadAlternateHTMLText) { EXPECT_EQ(ViewHostMsg_DidStartProvisionalLoadForFrame::ID, msg->type()); ViewHostMsg_DidStartProvisionalLoadForFrame::Param start_params; ViewHostMsg_DidStartProvisionalLoadForFrame::Read(msg, &start_params); - EXPECT_EQ(GURL("chrome-ui://chromewebdata/"), start_params.b); + EXPECT_EQ(GURL("chrome://chromewebdata/"), start_params.b); } // Test that we get form state change notifications when input fields change. diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 75c4063..ea8129e 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -19,6 +19,7 @@ #include "base/string_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" +#include "chrome/common/url_constants.h" #include "chrome/plugin/npobject_util.h" #include "chrome/renderer/net/render_dns_master.h" #include "chrome/renderer/render_process.h" @@ -207,11 +208,12 @@ void ClipboardReadHTML(string16* markup, GURL* url) { } GURL GetInspectorURL() { - return GURL("chrome-ui://inspector/inspector.html"); + return GURL(std::string(chrome::kChromeUIScheme) + + "//inspector/inspector.html"); } std::string GetUIResourceProtocol() { - return "chrome-ui"; + return "chrome"; } bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { |