summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-01 01:20:59 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-01 01:20:59 +0000
commit4fdbc1492aa5003c6fdc0df7f95b3ae9046380e2 (patch)
treee806806102de20b0fab1c1d497d1332839b6a77f /chrome/renderer/render_view.cc
parent17d40f00b7d7a078649fb142961f612c29553ec0 (diff)
downloadchromium_src-4fdbc1492aa5003c6fdc0df7f95b3ae9046380e2.zip
chromium_src-4fdbc1492aa5003c6fdc0df7f95b3ae9046380e2.tar.gz
chromium_src-4fdbc1492aa5003c6fdc0df7f95b3ae9046380e2.tar.bz2
Add the concept of browse extent.
BUG=46636 Review URL: http://codereview.chromium.org/2862034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view.cc')
-rw-r--r--chrome/renderer/render_view.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 59ec64a..d66d791 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -344,10 +344,17 @@ static bool CrossesExtensionExtents(WebFrame* frame, const GURL& new_url) {
old_url = frame->opener()->url();
std::string old_extension =
- RenderThread::current()->GetExtensionIdForURL(old_url);
+ RenderThread::current()->GetExtensionIdByURL(old_url);
+ if (!old_extension.empty()) {
+ if (RenderThread::current()->GetExtensionIdByBrowseExtent(new_url) ==
+ old_extension) {
+ return false;
+ }
+ }
+
std::string new_extension =
- RenderThread::current()->GetExtensionIdForURL(new_url);
- return (old_extension != new_extension);
+ RenderThread::current()->GetExtensionIdByURL(new_url);
+ return old_extension != new_extension;
}
// Returns the ISO 639_1 language code of the specified |text|, or 'unknown'