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

Side by Side Diff: chrome/browser/android/chrome_web_contents_delegate_android.cc

Issue 896673003: Propagate audible state from player to the containing tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments by Daniel and Min Created 5 years, 9 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
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 "chrome/browser/android/chrome_web_contents_delegate_android.h" 5 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 25 matching lines...) Expand all
36 #include "ui/gfx/geometry/rect_f.h" 36 #include "ui/gfx/geometry/rect_f.h"
37 37
38 #if defined(ENABLE_PLUGINS) 38 #if defined(ENABLE_PLUGINS)
39 #include "chrome/browser/pepper_broker_infobar_delegate.h" 39 #include "chrome/browser/pepper_broker_infobar_delegate.h"
40 #endif 40 #endif
41 41
42 using base::android::AttachCurrentThread; 42 using base::android::AttachCurrentThread;
43 using base::android::ScopedJavaLocalRef; 43 using base::android::ScopedJavaLocalRef;
44 using content::FileChooserParams; 44 using content::FileChooserParams;
45 using content::WebContents; 45 using content::WebContents;
46 using content::WebContentsImpl;
46 47
47 namespace { 48 namespace {
48 49
49 ScopedJavaLocalRef<jobject> CreateJavaRectF( 50 ScopedJavaLocalRef<jobject> CreateJavaRectF(
50 JNIEnv* env, 51 JNIEnv* env,
51 const gfx::RectF& rect) { 52 const gfx::RectF& rect) {
52 return ScopedJavaLocalRef<jobject>( 53 return ScopedJavaLocalRef<jobject>(
53 Java_ChromeWebContentsDelegateAndroid_createRectF(env, 54 Java_ChromeWebContentsDelegateAndroid_createRectF(env,
54 rect.x(), 55 rect.x(),
55 rect.y(), 56 rect.y(),
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 jclass clazz, 365 jclass clazz,
365 jobject java_web_contents) { 366 jobject java_web_contents) {
366 content::WebContents* web_contents = 367 content::WebContents* web_contents =
367 content::WebContents::FromJavaWebContents(java_web_contents); 368 content::WebContents::FromJavaWebContents(java_web_contents);
368 scoped_refptr<MediaStreamCaptureIndicator> indicator = 369 scoped_refptr<MediaStreamCaptureIndicator> indicator =
369 MediaCaptureDevicesDispatcher::GetInstance()-> 370 MediaCaptureDevicesDispatcher::GetInstance()->
370 GetMediaStreamCaptureIndicator(); 371 GetMediaStreamCaptureIndicator();
371 return indicator->IsCapturingVideo(web_contents); 372 return indicator->IsCapturingVideo(web_contents);
372 } 373 }
373 374
375 jboolean IsPlayingAudio(JNIEnv* env,
376 jclass clazz,
377 jobject java_web_contents) {
378 return false; // not implemented
379 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698