Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1159113006: [Android] A prototype of the interactive media notification. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added browser tests Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 4166 matching lines...) Expand 10 before | Expand all | Expand 10 after
4294 } 4295 }
4295 return web_contents_android; 4296 return web_contents_android;
4296 } 4297 }
4297 4298
4298 bool WebContentsImpl::CreateRenderViewForInitialEmptyDocument() { 4299 bool WebContentsImpl::CreateRenderViewForInitialEmptyDocument() {
4299 return CreateRenderViewForRenderManager( 4300 return CreateRenderViewForRenderManager(
4300 GetRenderViewHost(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, 4301 GetRenderViewHost(), MSG_ROUTING_NONE, MSG_ROUTING_NONE,
4301 frame_tree_.root()->current_replication_state(), true); 4302 frame_tree_.root()->current_replication_state(), true);
4302 } 4303 }
4303 4304
4305 MediaControlsDelegate* WebContentsImpl::GetMediaControlsDelegate() {
4306 return MediaSession::Get(this);
4307 }
4308
4304 #elif defined(OS_MACOSX) 4309 #elif defined(OS_MACOSX)
4305 4310
4306 void WebContentsImpl::SetAllowOtherViews(bool allow) { 4311 void WebContentsImpl::SetAllowOtherViews(bool allow) {
4307 view_->SetAllowOtherViews(allow); 4312 view_->SetAllowOtherViews(allow);
4308 } 4313 }
4309 4314
4310 bool WebContentsImpl::GetAllowOtherViews() { 4315 bool WebContentsImpl::GetAllowOtherViews() {
4311 return view_->GetAllowOtherViews(); 4316 return view_->GetAllowOtherViews();
4312 } 4317 }
4313 4318
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
4461 player_map->erase(it); 4466 player_map->erase(it);
4462 } 4467 }
4463 4468
4464 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4469 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4465 force_disable_overscroll_content_ = force_disable; 4470 force_disable_overscroll_content_ = force_disable;
4466 if (view_) 4471 if (view_)
4467 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4472 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4468 } 4473 }
4469 4474
4470 } // namespace content 4475 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698