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

Unified Diff: chrome/browser/tab_contents/site_instance.cc

Issue 28209: Back out r10487 too (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 10 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
« no previous file with comments | « chrome/browser/tab_contents/navigation_controller.cc ('k') | chrome/browser/task_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/site_instance.cc
===================================================================
--- chrome/browser/tab_contents/site_instance.cc (revision 10505)
+++ chrome/browser/tab_contents/site_instance.cc (working copy)
@@ -131,12 +131,12 @@
// We treat about:crash, about:hang, and about:shorthang as the same site as
// any URL, since they are used as demos for crashing/hanging a process.
- if (url1.spec() == chrome::kAboutCrashURL ||
- url2.spec() == chrome::kAboutCrashURL ||
- url1.spec() == chrome::kAboutHangURL ||
- url2.spec() == chrome::kAboutHangURL ||
- url1.spec() == chrome::kAboutShortHangURL ||
- url2.spec() == chrome::kAboutShortHangURL)
+ GURL about_crash = GURL("about:crash");
+ GURL about_hang = GURL("about:hang");
+ GURL about_shorthang = GURL("about:shorthang");
+ if (url1 == about_crash || url2 == about_crash ||
+ url1 == about_hang || url2 == about_hang ||
+ url1 == about_shorthang || url2 == about_shorthang)
return true;
// If either URL is invalid, they aren't part of the same site.
« no previous file with comments | « chrome/browser/tab_contents/navigation_controller.cc ('k') | chrome/browser/task_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698