summaryrefslogtreecommitdiffstats
path: root/mandoline
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-08-17 16:37:40 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-17 23:38:25 +0000
commitfdff335c897731c036dbe4d598453bf3e2ebd617 (patch)
tree0fa7d982013e292cb485d1e69c8be39dc74b3479 /mandoline
parent00c8be997defd122486897faae3e09eb930f0f8d (diff)
downloadchromium_src-fdff335c897731c036dbe4d598453bf3e2ebd617.zip
chromium_src-fdff335c897731c036dbe4d598453bf3e2ebd617.tar.gz
chromium_src-fdff335c897731c036dbe4d598453bf3e2ebd617.tar.bz2
Honors requests to navigate in existing frame for the root
Without this we drop the request on the floor. BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/1297073003 Cr-Commit-Position: refs/heads/master@{#343775}
Diffstat (limited to 'mandoline')
-rw-r--r--mandoline/tab/web_view_impl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/mandoline/tab/web_view_impl.cc b/mandoline/tab/web_view_impl.cc
index 1856381..cb4652c 100644
--- a/mandoline/tab/web_view_impl.cc
+++ b/mandoline/tab/web_view_impl.cc
@@ -137,9 +137,9 @@ void WebViewImpl::RequestNavigate(Frame* source,
Frame* target_frame,
mojo::URLRequestPtr request) {
// TODO: this needs security checks.
- if (target_type == mandoline::NAVIGATION_TARGET_TYPE_EXISTING_FRAME) {
- if (target_frame && target_frame != frame_tree_->root() &&
- target_frame->view()) {
+ if (target_type == mandoline::NAVIGATION_TARGET_TYPE_EXISTING_FRAME &&
+ target_frame != frame_tree_->root()) {
+ if (target_frame && target_frame->view()) {
NavigateExistingFrame(target_frame, request.Pass());
return;
}