OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1276 // We delay calling this until we have the WebFrame so that any observer or | 1276 // We delay calling this until we have the WebFrame so that any observer or |
1277 // embedder can call GetWebFrame on any RenderFrame. | 1277 // embedder can call GetWebFrame on any RenderFrame. |
1278 GetContentClient()->renderer()->RenderFrameCreated(this); | 1278 GetContentClient()->renderer()->RenderFrameCreated(this); |
1279 | 1279 |
1280 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 1280 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
1281 // render_thread may be NULL in tests. | 1281 // render_thread may be NULL in tests. |
1282 InputHandlerManager* input_handler_manager = | 1282 InputHandlerManager* input_handler_manager = |
1283 render_thread ? render_thread->input_handler_manager() : nullptr; | 1283 render_thread ? render_thread->input_handler_manager() : nullptr; |
1284 if (input_handler_manager) { | 1284 if (input_handler_manager) { |
1285 DCHECK(render_view_->HasAddedInputHandler()); | 1285 DCHECK(render_view_->HasAddedInputHandler()); |
1286 input_handler_manager->RegisterRoutingID(GetRoutingID()); | 1286 input_handler_manager->AssociateRenderFrameRoutingID( |
| 1287 GetRoutingID(), render_view_->GetRoutingID()); |
1287 } | 1288 } |
1288 | 1289 |
1289 const base::CommandLine& command_line = | 1290 const base::CommandLine& command_line = |
1290 *base::CommandLine::ForCurrentProcess(); | 1291 *base::CommandLine::ForCurrentProcess(); |
1291 if (command_line.HasSwitch(switches::kDomAutomationController)) | 1292 if (command_line.HasSwitch(switches::kDomAutomationController)) |
1292 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION; | 1293 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION; |
1293 if (command_line.HasSwitch(switches::kStatsCollectionController)) | 1294 if (command_line.HasSwitch(switches::kStatsCollectionController)) |
1294 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION; | 1295 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION; |
1295 } | 1296 } |
1296 | 1297 |
(...skipping 5672 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6969 policy(info.defaultPolicy), | 6970 policy(info.defaultPolicy), |
6970 replaces_current_history_item(info.replacesCurrentHistoryItem), | 6971 replaces_current_history_item(info.replacesCurrentHistoryItem), |
6971 history_navigation_in_new_child_frame( | 6972 history_navigation_in_new_child_frame( |
6972 info.isHistoryNavigationInNewChildFrame), | 6973 info.isHistoryNavigationInNewChildFrame), |
6973 client_redirect(info.isClientRedirect), | 6974 client_redirect(info.isClientRedirect), |
6974 cache_disabled(info.isCacheDisabled), | 6975 cache_disabled(info.isCacheDisabled), |
6975 form(info.form), | 6976 form(info.form), |
6976 source_location(info.sourceLocation) {} | 6977 source_location(info.sourceLocation) {} |
6977 | 6978 |
6978 } // namespace content | 6979 } // namespace content |
OLD | NEW |