Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1335)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 7044013: Drop url_constants dependency in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forgot null check Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 50307688bc94ce16d37c6d05579e925b8b662733..74015d477a8db912ab16c1d8a753617bf83b88bc 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -112,6 +112,17 @@ void InitRenderViewHostForExtensions(RenderViewHost* render_view_host) {
namespace chrome {
+ChromeContentBrowserClient::ChromeContentBrowserClient() {
+ // We treat about:kill, about:hang, and about:shorthang as the same site as
+ // any URL since they are actually modifiers on existing pages.
+ schemes_same_as_any_site_instance_.insert(chrome::kAboutKillURL);
+ schemes_same_as_any_site_instance_.insert(chrome::kAboutHangURL);
+ schemes_same_as_any_site_instance_.insert(chrome::kAboutShorthangURL);
+}
+
+ChromeContentBrowserClient::~ChromeContentBrowserClient() {
+}
+
void ChromeContentBrowserClient::RenderViewHostCreated(
RenderViewHost* render_view_host) {
new ChromeRenderViewHostObserver(render_view_host);
@@ -170,6 +181,11 @@ GURL ChromeContentBrowserClient::GetEffectiveURL(Profile* profile,
return extension->GetResourceURL(url.path());
}
+const std::set<std::string>*
+ChromeContentBrowserClient::GetSchemesSameAsAnySiteInstance() {
+ return &schemes_same_as_any_site_instance_;
+}
+
GURL ChromeContentBrowserClient::GetAlternateErrorPageURL(
const TabContents* tab) {
GURL url;

Powered by Google App Engine
This is Rietveld 408576698