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

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: 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "webkit/fileapi/isolated_context.h" 68 #include "webkit/fileapi/isolated_context.h"
69 #include "webkit/glue/webdropdata.h" 69 #include "webkit/glue/webdropdata.h"
70 #include "webkit/glue/webkit_glue.h" 70 #include "webkit/glue/webkit_glue.h"
71 71
72 #if defined(OS_WIN) 72 #if defined(OS_WIN)
73 #include "base/win/windows_version.h" 73 #include "base/win/windows_version.h"
74 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFact ory.h" 74 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFact ory.h"
75 #elif defined(OS_MACOSX) 75 #elif defined(OS_MACOSX)
76 #include "content/browser/renderer_host/popup_menu_helper_mac.h" 76 #include "content/browser/renderer_host/popup_menu_helper_mac.h"
77 #elif defined(OS_ANDROID) 77 #elif defined(OS_ANDROID)
78 #include "content/browser/android/media_player_manager_android.h" 78 #include "content/browser/android/media_player_manager_impl.h"
79 #endif 79 #endif
80 80
81 using base::TimeDelta; 81 using base::TimeDelta;
82 using WebKit::WebConsoleMessage; 82 using WebKit::WebConsoleMessage;
83 using WebKit::WebDragOperation; 83 using WebKit::WebDragOperation;
84 using WebKit::WebDragOperationNone; 84 using WebKit::WebDragOperationNone;
85 using WebKit::WebDragOperationsMask; 85 using WebKit::WebDragOperationsMask;
86 using WebKit::WebInputEvent; 86 using WebKit::WebInputEvent;
87 using WebKit::WebMediaPlayerAction; 87 using WebKit::WebMediaPlayerAction;
88 using WebKit::WebPluginAction; 88 using WebKit::WebPluginAction;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 DCHECK(session_storage_namespace_); 187 DCHECK(session_storage_namespace_);
188 DCHECK(instance_); 188 DCHECK(instance_);
189 CHECK(delegate_); // http://crbug.com/82827 189 CHECK(delegate_); // http://crbug.com/82827
190 190
191 GetProcess()->EnableSendQueue(); 191 GetProcess()->EnableSendQueue();
192 192
193 for (size_t i = 0; i < g_created_callbacks.Get().size(); i++) 193 for (size_t i = 0; i < g_created_callbacks.Get().size(); i++)
194 g_created_callbacks.Get().at(i).Run(this); 194 g_created_callbacks.Get().at(i).Run(this);
195 195
196 #if defined(OS_ANDROID) 196 #if defined(OS_ANDROID)
197 media_player_manager_ = new MediaPlayerManagerAndroid(this); 197 media_player_manager_ = new MediaPlayerManagerImpl(this);
198 #endif 198 #endif
199 } 199 }
200 200
201 RenderViewHostImpl::~RenderViewHostImpl() { 201 RenderViewHostImpl::~RenderViewHostImpl() {
202 FOR_EACH_OBSERVER( 202 FOR_EACH_OBSERVER(
203 RenderViewHostObserver, observers_, RenderViewHostDestruction()); 203 RenderViewHostObserver, observers_, RenderViewHostDestruction());
204 204
205 ClearPowerSaveBlockers(); 205 ClearPowerSaveBlockers();
206 206
207 GetDelegate()->RenderViewDeleted(this); 207 GetDelegate()->RenderViewDeleted(this);
(...skipping 1827 matching lines...) Expand 10 before | Expand all | Expand 10 after
2035 is_waiting_for_beforeunload_ack_ = false; 2035 is_waiting_for_beforeunload_ack_ = false;
2036 is_waiting_for_unload_ack_ = false; 2036 is_waiting_for_unload_ack_ = false;
2037 has_timed_out_on_unload_ = false; 2037 has_timed_out_on_unload_ = false;
2038 } 2038 }
2039 2039
2040 void RenderViewHostImpl::ClearPowerSaveBlockers() { 2040 void RenderViewHostImpl::ClearPowerSaveBlockers() {
2041 STLDeleteValues(&power_save_blockers_); 2041 STLDeleteValues(&power_save_blockers_);
2042 } 2042 }
2043 2043
2044 } // namespace content 2044 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698