OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <cmath> | 9 #include <cmath> |
10 #include <utility> | 10 #include <utility> |
(...skipping 2107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2118 // Save the created window associated with the route so we can show it | 2118 // Save the created window associated with the route so we can show it |
2119 // later. | 2119 // later. |
2120 DCHECK_NE(MSG_ROUTING_NONE, route_id); | 2120 DCHECK_NE(MSG_ROUTING_NONE, route_id); |
2121 pending_contents_[std::make_pair(render_process_id, route_id)] = | 2121 pending_contents_[std::make_pair(render_process_id, route_id)] = |
2122 new_contents; | 2122 new_contents; |
2123 AddDestructionObserver(new_contents); | 2123 AddDestructionObserver(new_contents); |
2124 } | 2124 } |
2125 | 2125 |
2126 if (delegate_) { | 2126 if (delegate_) { |
2127 delegate_->WebContentsCreated( | 2127 delegate_->WebContentsCreated( |
2128 this, params.opener_render_frame_id, params.frame_name, | 2128 this, render_process_id, params.opener_render_frame_id, |
2129 params.target_url, new_contents); | 2129 params.frame_name, params.target_url, new_contents); |
2130 } | 2130 } |
2131 | 2131 |
2132 if (params.opener_suppressed) { | 2132 if (params.opener_suppressed) { |
2133 // When the opener is suppressed, the original renderer cannot access the | 2133 // When the opener is suppressed, the original renderer cannot access the |
2134 // new window. As a result, we need to show and navigate the window here. | 2134 // new window. As a result, we need to show and navigate the window here. |
2135 bool was_blocked = false; | 2135 bool was_blocked = false; |
2136 if (delegate_) { | 2136 if (delegate_) { |
2137 gfx::Rect initial_rect; | 2137 gfx::Rect initial_rect; |
2138 delegate_->AddNewContents( | 2138 delegate_->AddNewContents( |
2139 this, new_contents, params.disposition, initial_rect, | 2139 this, new_contents, params.disposition, initial_rect, |
(...skipping 3125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5265 dialog_manager_ = dialog_manager; | 5265 dialog_manager_ = dialog_manager; |
5266 } | 5266 } |
5267 | 5267 |
5268 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { | 5268 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { |
5269 auto it = binding_sets_.find(interface_name); | 5269 auto it = binding_sets_.find(interface_name); |
5270 if (it != binding_sets_.end()) | 5270 if (it != binding_sets_.end()) |
5271 binding_sets_.erase(it); | 5271 binding_sets_.erase(it); |
5272 } | 5272 } |
5273 | 5273 |
5274 } // namespace content | 5274 } // namespace content |
OLD | NEW |