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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 | 108 |
109 #if defined(ENABLE_BROWSER_CDMS) | 109 #if defined(ENABLE_BROWSER_CDMS) |
110 #include "content/browser/media/media_web_contents_observer.h" | 110 #include "content/browser/media/media_web_contents_observer.h" |
111 #endif | 111 #endif |
112 | 112 |
113 #if defined(OS_ANDROID) | 113 #if defined(OS_ANDROID) |
114 #include "content/browser/android/content_video_view.h" | 114 #include "content/browser/android/content_video_view.h" |
115 #include "content/browser/android/date_time_chooser_android.h" | 115 #include "content/browser/android/date_time_chooser_android.h" |
116 #include "content/browser/android/media_players_observer.h" | 116 #include "content/browser/android/media_players_observer.h" |
117 #include "content/browser/media/android/browser_media_player_manager.h" | 117 #include "content/browser/media/android/browser_media_player_manager.h" |
| 118 #include "content/browser/media/android/media_session.h" |
118 #include "content/browser/web_contents/web_contents_android.h" | 119 #include "content/browser/web_contents/web_contents_android.h" |
119 #endif | 120 #endif |
120 | 121 |
121 #if defined(OS_MACOSX) | 122 #if defined(OS_MACOSX) |
122 #include "base/mac/foundation_util.h" | 123 #include "base/mac/foundation_util.h" |
123 #endif | 124 #endif |
124 | 125 |
125 namespace content { | 126 namespace content { |
126 namespace { | 127 namespace { |
127 | 128 |
(...skipping 4113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4241 } | 4242 } |
4242 return web_contents_android; | 4243 return web_contents_android; |
4243 } | 4244 } |
4244 | 4245 |
4245 bool WebContentsImpl::CreateRenderViewForInitialEmptyDocument() { | 4246 bool WebContentsImpl::CreateRenderViewForInitialEmptyDocument() { |
4246 return CreateRenderViewForRenderManager( | 4247 return CreateRenderViewForRenderManager( |
4247 GetRenderViewHost(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, | 4248 GetRenderViewHost(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, |
4248 frame_tree_.root()->current_replication_state(), true); | 4249 frame_tree_.root()->current_replication_state(), true); |
4249 } | 4250 } |
4250 | 4251 |
| 4252 MediaControlsDelegate* WebContentsImpl::GetMediaControlsDelegate() { |
| 4253 return MediaSession::Get(this); |
| 4254 } |
| 4255 |
4251 #elif defined(OS_MACOSX) | 4256 #elif defined(OS_MACOSX) |
4252 | 4257 |
4253 void WebContentsImpl::SetAllowOtherViews(bool allow) { | 4258 void WebContentsImpl::SetAllowOtherViews(bool allow) { |
4254 view_->SetAllowOtherViews(allow); | 4259 view_->SetAllowOtherViews(allow); |
4255 } | 4260 } |
4256 | 4261 |
4257 bool WebContentsImpl::GetAllowOtherViews() { | 4262 bool WebContentsImpl::GetAllowOtherViews() { |
4258 return view_->GetAllowOtherViews(); | 4263 return view_->GetAllowOtherViews(); |
4259 } | 4264 } |
4260 | 4265 |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4408 player_map->erase(it); | 4413 player_map->erase(it); |
4409 } | 4414 } |
4410 | 4415 |
4411 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4416 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4412 force_disable_overscroll_content_ = force_disable; | 4417 force_disable_overscroll_content_ = force_disable; |
4413 if (view_) | 4418 if (view_) |
4414 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4419 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4415 } | 4420 } |
4416 | 4421 |
4417 } // namespace content | 4422 } // namespace content |
OLD | NEW |