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

Side by Side Diff: content/browser/android/child_process_launcher_android.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
« no previous file with comments | « no previous file | content/browser/android/content_video_view.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/android/child_process_launcher_android.h" 5 #include "content/browser/android/child_process_launcher_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "content/browser/android/media_player_manager_android.h" 11 #include "content/browser/android/media_player_manager_impl.h"
12 #include "content/browser/renderer_host/compositor_impl_android.h" 12 #include "content/browser/renderer_host/compositor_impl_android.h"
13 #include "content/browser/renderer_host/render_view_host_impl.h" 13 #include "content/browser/renderer_host/render_view_host_impl.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/render_process_host.h" 15 #include "content/public/browser/render_process_host.h"
16 #include "jni/ChildProcessLauncher_jni.h" 16 #include "jni/ChildProcessLauncher_jni.h"
17 #include "media/base/android/media_player_bridge.h" 17 #include "media/base/android/media_player_bridge.h"
18 #include "ui/gl/android/scoped_java_surface.h" 18 #include "ui/gl/android/scoped_java_surface.h"
19 19
20 using base::android::AttachCurrentThread; 20 using base::android::AttachCurrentThread;
21 using base::android::ToJavaArrayOfStrings; 21 using base::android::ToJavaArrayOfStrings;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // to deadlocks. 149 // to deadlocks.
150 DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI)); 150 DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
151 return CompositorImpl::GetSurface(surface_id); 151 return CompositorImpl::GetSurface(surface_id);
152 } 152 }
153 153
154 bool RegisterChildProcessLauncher(JNIEnv* env) { 154 bool RegisterChildProcessLauncher(JNIEnv* env) {
155 return RegisterNativesImpl(env); 155 return RegisterNativesImpl(env);
156 } 156 }
157 157
158 } // namespace content 158 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/content_video_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698