content/renderer/media/android/webmediaplayer_manager_android.cc - Issue 17502007: Move webkit/renderer/media/android/ to content/renderer/media/android/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/media/android/webmediaplayer_manager_android.h ('k') | content/renderer/media/android/webmediaplayer_proxy_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/webmediaplayer_manager_android.cc

diff --git a/webkit/renderer/media/android/webmediaplayer_manager_android.cc b/content/renderer/media/android/webmediaplayer_manager_android.cc

similarity index 93%

rename from webkit/renderer/media/android/webmediaplayer_manager_android.cc

rename to content/renderer/media/android/webmediaplayer_manager_android.cc

index 420b18d52e394b5d6791127ef41b42354f38a609..b53c41b34cdbddcdfe72a219e476a225b478b3a7 100644

--- a/webkit/renderer/media/android/webmediaplayer_manager_android.cc

+++ b/content/renderer/media/android/webmediaplayer_manager_android.cc

@@ -2,12 +2,12 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "webkit/renderer/media/android/webmediaplayer_manager_android.h"

+#include "content/renderer/media/android/webmediaplayer_manager_android.h"

+#include "content/renderer/media/android/webmediaplayer_android.h"

#include "ui/gfx/rect_f.h"

-#include "webkit/renderer/media/android/webmediaplayer_android.h"

-namespace webkit_media {

+namespace content {

WebMediaPlayerManagerAndroid::WebMediaPlayerManagerAndroid()

: next_media_player_id_(0),

@@ -94,4 +94,4 @@ void WebMediaPlayerManagerAndroid::RetrieveGeometryChanges(

}

#endif

-} // namespace webkit_media

+} // namespace content