| 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 1218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1229 // DevToolsAgent is a RenderFrameObserver, and will destruct itself | 1229 // DevToolsAgent is a RenderFrameObserver, and will destruct itself |
| 1230 // when |this| is deleted. | 1230 // when |this| is deleted. |
| 1231 devtools_agent_ = new DevToolsAgent(this); | 1231 devtools_agent_ = new DevToolsAgent(this); |
| 1232 } | 1232 } |
| 1233 | 1233 |
| 1234 RegisterMojoInterfaces(); | 1234 RegisterMojoInterfaces(); |
| 1235 | 1235 |
| 1236 // We delay calling this until we have the WebFrame so that any observer or | 1236 // We delay calling this until we have the WebFrame so that any observer or |
| 1237 // embedder can call GetWebFrame on any RenderFrame. | 1237 // embedder can call GetWebFrame on any RenderFrame. |
| 1238 GetContentClient()->renderer()->RenderFrameCreated(this); | 1238 GetContentClient()->renderer()->RenderFrameCreated(this); |
| 1239 frame_->startAgents(); |
| 1239 | 1240 |
| 1240 #if defined(OS_ANDROID) | 1241 #if defined(OS_ANDROID) |
| 1241 new AppWebMessagePortClient(this); | 1242 new AppWebMessagePortClient(this); |
| 1242 #endif | 1243 #endif |
| 1243 | 1244 |
| 1244 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 1245 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
| 1245 // render_thread may be NULL in tests. | 1246 // render_thread may be NULL in tests. |
| 1246 InputHandlerManager* input_handler_manager = | 1247 InputHandlerManager* input_handler_manager = |
| 1247 render_thread ? render_thread->input_handler_manager() : nullptr; | 1248 render_thread ? render_thread->input_handler_manager() : nullptr; |
| 1248 if (input_handler_manager) { | 1249 if (input_handler_manager) { |
| (...skipping 5581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6830 // event target. Potentially a Pepper plugin will receive the event. | 6831 // event target. Potentially a Pepper plugin will receive the event. |
| 6831 // In order to tell whether a plugin gets the last mouse event and which it | 6832 // In order to tell whether a plugin gets the last mouse event and which it |
| 6832 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6833 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6833 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6834 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6834 // |pepper_last_mouse_event_target_|. | 6835 // |pepper_last_mouse_event_target_|. |
| 6835 pepper_last_mouse_event_target_ = nullptr; | 6836 pepper_last_mouse_event_target_ = nullptr; |
| 6836 #endif | 6837 #endif |
| 6837 } | 6838 } |
| 6838 | 6839 |
| 6839 } // namespace content | 6840 } // namespace content |
| OLD | NEW |