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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
52 #include "content/renderer/child_frame_compositing_helper.h" | 52 #include "content/renderer/child_frame_compositing_helper.h" |
53 #include "content/renderer/context_menu_params_builder.h" | 53 #include "content/renderer/context_menu_params_builder.h" |
54 #include "content/renderer/devtools/devtools_agent.h" | 54 #include "content/renderer/devtools/devtools_agent.h" |
55 #include "content/renderer/dom_automation_controller.h" | 55 #include "content/renderer/dom_automation_controller.h" |
56 #include "content/renderer/geolocation_dispatcher.h" | 56 #include "content/renderer/geolocation_dispatcher.h" |
57 #include "content/renderer/history_controller.h" | 57 #include "content/renderer/history_controller.h" |
58 #include "content/renderer/history_serialization.h" | 58 #include "content/renderer/history_serialization.h" |
59 #include "content/renderer/image_loading_helper.h" | 59 #include "content/renderer/image_loading_helper.h" |
60 #include "content/renderer/ime_event_guard.h" | 60 #include "content/renderer/ime_event_guard.h" |
61 #include "content/renderer/internal_document_state_data.h" | 61 #include "content/renderer/internal_document_state_data.h" |
62 #include "content/renderer/java/java_bridge_dispatcher.h" | 62 #include "content/renderer/java/gin_java_bridge_dispatcher.h" |
jamesr
2014/06/30 19:17:52
why isn't this in the OS_ANDROID block?
mnaganov (inactive)
2014/07/01 12:38:09
Done.
| |
63 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 63 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
64 #include "content/renderer/media/media_stream_dispatcher.h" | 64 #include "content/renderer/media/media_stream_dispatcher.h" |
65 #include "content/renderer/media/media_stream_impl.h" | 65 #include "content/renderer/media/media_stream_impl.h" |
66 #include "content/renderer/media/media_stream_renderer_factory.h" | 66 #include "content/renderer/media/media_stream_renderer_factory.h" |
67 #include "content/renderer/media/midi_dispatcher.h" | 67 #include "content/renderer/media/midi_dispatcher.h" |
68 #include "content/renderer/media/render_media_log.h" | 68 #include "content/renderer/media/render_media_log.h" |
69 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" | 69 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" |
70 #include "content/renderer/media/webmediaplayer_impl.h" | 70 #include "content/renderer/media/webmediaplayer_impl.h" |
71 #include "content/renderer/media/webmediaplayer_ms.h" | 71 #include "content/renderer/media/webmediaplayer_ms.h" |
72 #include "content/renderer/media/webmediaplayer_params.h" | 72 #include "content/renderer/media/webmediaplayer_params.h" |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
410 weak_factory_(this) { | 410 weak_factory_(this) { |
411 std::pair<RoutingIDFrameMap::iterator, bool> result = | 411 std::pair<RoutingIDFrameMap::iterator, bool> result = |
412 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); | 412 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); |
413 CHECK(result.second) << "Inserting a duplicate item."; | 413 CHECK(result.second) << "Inserting a duplicate item."; |
414 | 414 |
415 RenderThread::Get()->AddRoute(routing_id_, this); | 415 RenderThread::Get()->AddRoute(routing_id_, this); |
416 | 416 |
417 render_view_->RegisterRenderFrame(this); | 417 render_view_->RegisterRenderFrame(this); |
418 | 418 |
419 #if defined(OS_ANDROID) | 419 #if defined(OS_ANDROID) |
420 new JavaBridgeDispatcher(this); | 420 new GinJavaBridgeDispatcher(this); |
421 #endif | 421 #endif |
422 | 422 |
423 #if defined(ENABLE_NOTIFICATIONS) | 423 #if defined(ENABLE_NOTIFICATIONS) |
424 notification_provider_ = new NotificationProvider(this); | 424 notification_provider_ = new NotificationProvider(this); |
425 #endif | 425 #endif |
426 } | 426 } |
427 | 427 |
428 RenderFrameImpl::~RenderFrameImpl() { | 428 RenderFrameImpl::~RenderFrameImpl() { |
429 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone()); | 429 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone()); |
430 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct()); | 430 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct()); |
(...skipping 3133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3564 | 3564 |
3565 #if defined(ENABLE_BROWSER_CDMS) | 3565 #if defined(ENABLE_BROWSER_CDMS) |
3566 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3566 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
3567 if (!cdm_manager_) | 3567 if (!cdm_manager_) |
3568 cdm_manager_ = new RendererCdmManager(this); | 3568 cdm_manager_ = new RendererCdmManager(this); |
3569 return cdm_manager_; | 3569 return cdm_manager_; |
3570 } | 3570 } |
3571 #endif // defined(ENABLE_BROWSER_CDMS) | 3571 #endif // defined(ENABLE_BROWSER_CDMS) |
3572 | 3572 |
3573 } // namespace content | 3573 } // namespace content |
OLD | NEW |