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 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1105 if (is_tracing) { | 1105 if (is_tracing) { |
1106 int parent_id = GetRoutingIdForFrameOrProxy(frame_->parent()); | 1106 int parent_id = GetRoutingIdForFrameOrProxy(frame_->parent()); |
1107 TRACE_EVENT2("navigation", "RenderFrameImpl::Initialize", | 1107 TRACE_EVENT2("navigation", "RenderFrameImpl::Initialize", |
1108 "id", routing_id_, | 1108 "id", routing_id_, |
1109 "parent", parent_id); | 1109 "parent", parent_id); |
1110 } | 1110 } |
1111 | 1111 |
1112 if (IsMainFrame() && | 1112 if (IsMainFrame() && |
1113 RenderProcess::current()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI) { | 1113 RenderProcess::current()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI) { |
1114 EnableMojoBindings(false /* for_layout_tests */); | 1114 EnableMojoBindings(false /* for_layout_tests */); |
1115 } else if (RenderProcess::current()->GetEnabledBindings() & | |
Charlie Reis
2016/02/19 06:26:34
This doesn't look like it does the right thing.
W
Sam McNally
2016/02/22 09:31:19
I don't think that's possible; RenderViewImpl will
| |
1116 BINDINGS_POLICY_MOJO) { | |
1117 EnableMojoBindings(true /* for_layout_tests */); | |
Charlie Reis
2016/02/19 06:26:34
I don't understand how to infer that it's for layo
Sam McNally
2016/02/22 09:31:19
The way JS mojo bindings work in content is a bit
esprehn
2016/02/24 20:44:34
There should be no process that contains v8 mojo b
| |
1115 } | 1118 } |
1116 | 1119 |
1117 #if defined(ENABLE_PLUGINS) | 1120 #if defined(ENABLE_PLUGINS) |
1118 new PepperBrowserConnection(this); | 1121 new PepperBrowserConnection(this); |
1119 #endif | 1122 #endif |
1120 new SharedWorkerRepository(this); | 1123 new SharedWorkerRepository(this); |
1121 | 1124 |
1122 if (IsLocalRoot() && !is_swapped_out_) { | 1125 if (IsLocalRoot() && !is_swapped_out_) { |
1123 // DevToolsAgent is a RenderFrameObserver, and will destruct itself | 1126 // DevToolsAgent is a RenderFrameObserver, and will destruct itself |
1124 // when |this| is deleted. | 1127 // when |this| is deleted. |
(...skipping 4977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6102 int match_count, | 6105 int match_count, |
6103 int ordinal, | 6106 int ordinal, |
6104 const WebRect& selection_rect, | 6107 const WebRect& selection_rect, |
6105 bool final_status_update) { | 6108 bool final_status_update) { |
6106 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6109 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6107 selection_rect, ordinal, | 6110 selection_rect, ordinal, |
6108 final_status_update)); | 6111 final_status_update)); |
6109 } | 6112 } |
6110 | 6113 |
6111 } // namespace content | 6114 } // namespace content |
OLD | NEW |