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

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

Issue 14314020: Rename MediaPlayerBridgeManager to MediaPlayerManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional rebase conflict Created 7 years, 7 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
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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "webkit/fileapi/isolated_context.h" 69 #include "webkit/fileapi/isolated_context.h"
70 #include "webkit/glue/webdropdata.h" 70 #include "webkit/glue/webdropdata.h"
71 #include "webkit/glue/webkit_glue.h" 71 #include "webkit/glue/webkit_glue.h"
72 72
73 #if defined(OS_WIN) 73 #if defined(OS_WIN)
74 #include "base/win/windows_version.h" 74 #include "base/win/windows_version.h"
75 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFact ory.h" 75 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFact ory.h"
76 #elif defined(OS_MACOSX) 76 #elif defined(OS_MACOSX)
77 #include "content/browser/renderer_host/popup_menu_helper_mac.h" 77 #include "content/browser/renderer_host/popup_menu_helper_mac.h"
78 #elif defined(OS_ANDROID) 78 #elif defined(OS_ANDROID)
79 #include "content/browser/android/media_player_manager_android.h" 79 #include "content/browser/android/media_player_manager_impl.h"
80 #endif 80 #endif
81 81
82 using base::TimeDelta; 82 using base::TimeDelta;
83 using WebKit::WebConsoleMessage; 83 using WebKit::WebConsoleMessage;
84 using WebKit::WebDragOperation; 84 using WebKit::WebDragOperation;
85 using WebKit::WebDragOperationNone; 85 using WebKit::WebDragOperationNone;
86 using WebKit::WebDragOperationsMask; 86 using WebKit::WebDragOperationsMask;
87 using WebKit::WebInputEvent; 87 using WebKit::WebInputEvent;
88 using WebKit::WebMediaPlayerAction; 88 using WebKit::WebMediaPlayerAction;
89 using WebKit::WebPluginAction; 89 using WebKit::WebPluginAction;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 DCHECK(session_storage_namespace_); 188 DCHECK(session_storage_namespace_);
189 DCHECK(instance_); 189 DCHECK(instance_);
190 CHECK(delegate_); // http://crbug.com/82827 190 CHECK(delegate_); // http://crbug.com/82827
191 191
192 GetProcess()->EnableSendQueue(); 192 GetProcess()->EnableSendQueue();
193 193
194 for (size_t i = 0; i < g_created_callbacks.Get().size(); i++) 194 for (size_t i = 0; i < g_created_callbacks.Get().size(); i++)
195 g_created_callbacks.Get().at(i).Run(this); 195 g_created_callbacks.Get().at(i).Run(this);
196 196
197 #if defined(OS_ANDROID) 197 #if defined(OS_ANDROID)
198 media_player_manager_ = new MediaPlayerManagerAndroid(this); 198 media_player_manager_ = new MediaPlayerManagerImpl(this);
199 #endif 199 #endif
200 } 200 }
201 201
202 RenderViewHostImpl::~RenderViewHostImpl() { 202 RenderViewHostImpl::~RenderViewHostImpl() {
203 FOR_EACH_OBSERVER( 203 FOR_EACH_OBSERVER(
204 RenderViewHostObserver, observers_, RenderViewHostDestruction()); 204 RenderViewHostObserver, observers_, RenderViewHostDestruction());
205 205
206 ClearPowerSaveBlockers(); 206 ClearPowerSaveBlockers();
207 207
208 GetDelegate()->RenderViewDeleted(this); 208 GetDelegate()->RenderViewDeleted(this);
(...skipping 1828 matching lines...) Expand 10 before | Expand all | Expand 10 after
2037 is_waiting_for_beforeunload_ack_ = false; 2037 is_waiting_for_beforeunload_ack_ = false;
2038 is_waiting_for_unload_ack_ = false; 2038 is_waiting_for_unload_ack_ = false;
2039 has_timed_out_on_unload_ = false; 2039 has_timed_out_on_unload_ = false;
2040 } 2040 }
2041 2041
2042 void RenderViewHostImpl::ClearPowerSaveBlockers() { 2042 void RenderViewHostImpl::ClearPowerSaveBlockers() {
2043 STLDeleteValues(&power_save_blockers_); 2043 STLDeleteValues(&power_save_blockers_);
2044 } 2044 }
2045 2045
2046 } // namespace content 2046 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/browser/web_contents/web_contents_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698