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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments and resolving merge conflicts Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "ui/gfx/native_widget_types.h" 64 #include "ui/gfx/native_widget_types.h"
65 #include "webkit/fileapi/isolated_context.h" 65 #include "webkit/fileapi/isolated_context.h"
66 #include "webkit/glue/webdropdata.h" 66 #include "webkit/glue/webdropdata.h"
67 #include "webkit/glue/webkit_glue.h" 67 #include "webkit/glue/webkit_glue.h"
68 68
69 #if defined(OS_WIN) 69 #if defined(OS_WIN)
70 #include "base/win/windows_version.h" 70 #include "base/win/windows_version.h"
71 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFact ory.h" 71 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFact ory.h"
72 #elif defined(OS_MACOSX) 72 #elif defined(OS_MACOSX)
73 #include "content/browser/renderer_host/popup_menu_helper_mac.h" 73 #include "content/browser/renderer_host/popup_menu_helper_mac.h"
74 #elif defined(OS_ANDROID)
75 #include "content/browser/android/media_player_manager_android.h"
74 #endif 76 #endif
75 77
76 using base::TimeDelta; 78 using base::TimeDelta;
77 using content::NativeWebKeyboardEvent; 79 using content::NativeWebKeyboardEvent;
78 using content::RenderViewHostDelegateView; 80 using content::RenderViewHostDelegateView;
79 using WebKit::WebConsoleMessage; 81 using WebKit::WebConsoleMessage;
80 using WebKit::WebDragOperation; 82 using WebKit::WebDragOperation;
81 using WebKit::WebDragOperationNone; 83 using WebKit::WebDragOperationNone;
82 using WebKit::WebDragOperationsMask; 84 using WebKit::WebDragOperationsMask;
83 using WebKit::WebInputEvent; 85 using WebKit::WebInputEvent;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 CHECK(delegate_); // http://crbug.com/82827 180 CHECK(delegate_); // http://crbug.com/82827
179 181
180 GetProcess()->EnableSendQueue(); 182 GetProcess()->EnableSendQueue();
181 183
182 content::GetContentClient()->browser()->RenderViewHostCreated(this); 184 content::GetContentClient()->browser()->RenderViewHostCreated(this);
183 185
184 content::NotificationService::current()->Notify( 186 content::NotificationService::current()->Notify(
185 content::NOTIFICATION_RENDER_VIEW_HOST_CREATED, 187 content::NOTIFICATION_RENDER_VIEW_HOST_CREATED,
186 content::Source<RenderViewHost>(this), 188 content::Source<RenderViewHost>(this),
187 content::NotificationService::NoDetails()); 189 content::NotificationService::NoDetails());
190
191 #if defined(OS_ANDROID)
192 media_player_manager_ = new MediaPlayerManagerAndroid(this);
193 #endif
188 } 194 }
189 195
190 RenderViewHostImpl::~RenderViewHostImpl() { 196 RenderViewHostImpl::~RenderViewHostImpl() {
191 FOR_EACH_OBSERVER( 197 FOR_EACH_OBSERVER(
192 content::RenderViewHostObserver, observers_, RenderViewHostDestruction()); 198 content::RenderViewHostObserver, observers_, RenderViewHostDestruction());
193 199
194 content::NotificationService::current()->Notify( 200 content::NotificationService::current()->Notify(
195 content::NOTIFICATION_RENDER_VIEW_HOST_DELETED, 201 content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
196 content::Source<RenderViewHost>(this), 202 content::Source<RenderViewHost>(this),
197 content::NotificationService::NoDetails()); 203 content::NotificationService::NoDetails());
(...skipping 1723 matching lines...) Expand 10 before | Expand all | Expand 10 after
1921 // can cause navigations to be ignored in OnMsgNavigate. 1927 // can cause navigations to be ignored in OnMsgNavigate.
1922 is_waiting_for_beforeunload_ack_ = false; 1928 is_waiting_for_beforeunload_ack_ = false;
1923 is_waiting_for_unload_ack_ = false; 1929 is_waiting_for_unload_ack_ = false;
1924 } 1930 }
1925 1931
1926 void RenderViewHostImpl::ClearPowerSaveBlockers() { 1932 void RenderViewHostImpl::ClearPowerSaveBlockers() {
1927 STLDeleteValues(&power_save_blockers_); 1933 STLDeleteValues(&power_save_blockers_);
1928 } 1934 }
1929 1935
1930 } // namespace content 1936 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698