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

Side by Side Diff: content/renderer/media/android/webmediaplayer_manager_android.cc

Issue 17502007: Move webkit/renderer/media/android/ to content/renderer/media/android/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shared lib Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "webkit/renderer/media/android/webmediaplayer_manager_android.h" 5 #include "content/renderer/media/android/webmediaplayer_manager_android.h"
6 6
7 #include "content/renderer/media/android/webmediaplayer_android.h"
7 #include "ui/gfx/rect_f.h" 8 #include "ui/gfx/rect_f.h"
8 #include "webkit/renderer/media/android/webmediaplayer_android.h"
9 9
10 namespace webkit_media { 10 namespace content {
11 11
12 WebMediaPlayerManagerAndroid::WebMediaPlayerManagerAndroid() 12 WebMediaPlayerManagerAndroid::WebMediaPlayerManagerAndroid()
13 : next_media_player_id_(0), 13 : next_media_player_id_(0),
14 fullscreen_frame_(NULL) { 14 fullscreen_frame_(NULL) {
15 } 15 }
16 16
17 WebMediaPlayerManagerAndroid::~WebMediaPlayerManagerAndroid() { 17 WebMediaPlayerManagerAndroid::~WebMediaPlayerManagerAndroid() {
18 std::map<int, WebMediaPlayerAndroid*>::iterator player_it; 18 std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
19 for (player_it = media_players_.begin(); 19 for (player_it = media_players_.begin();
20 player_it != media_players_.end(); ++player_it) { 20 player_it != media_players_.end(); ++player_it) {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 if (player && player->hasVideo()) { 87 if (player && player->hasVideo()) {
88 gfx::RectF rect; 88 gfx::RectF rect;
89 if (player->RetrieveGeometryChange(&rect)) { 89 if (player->RetrieveGeometryChange(&rect)) {
90 (*changes)[player_it->first] = rect; 90 (*changes)[player_it->first] = rect;
91 } 91 }
92 } 92 }
93 } 93 }
94 } 94 }
95 #endif 95 #endif
96 96
97 } // namespace webkit_media 97 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698