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

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

Issue 1215713021: Reverted the code for the non-interactive audible tab notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@notification
Patch Set: Fixed indent Created 5 years, 3 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/android/feature_utilities.h" 10 #include "chrome/browser/android/feature_utilities.h"
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 jboolean IsCapturingVideo(JNIEnv* env, 389 jboolean IsCapturingVideo(JNIEnv* env,
390 jclass clazz, 390 jclass clazz,
391 jobject java_web_contents) { 391 jobject java_web_contents) {
392 content::WebContents* web_contents = 392 content::WebContents* web_contents =
393 content::WebContents::FromJavaWebContents(java_web_contents); 393 content::WebContents::FromJavaWebContents(java_web_contents);
394 scoped_refptr<MediaStreamCaptureIndicator> indicator = 394 scoped_refptr<MediaStreamCaptureIndicator> indicator =
395 MediaCaptureDevicesDispatcher::GetInstance()-> 395 MediaCaptureDevicesDispatcher::GetInstance()->
396 GetMediaStreamCaptureIndicator(); 396 GetMediaStreamCaptureIndicator();
397 return indicator->IsCapturingVideo(web_contents); 397 return indicator->IsCapturingVideo(web_contents);
398 } 398 }
399
400 jboolean HasAudibleAudio(JNIEnv* env,
401 jclass clazz,
402 jobject java_web_contents) {
403 content::WebContents* web_contents =
404 content::WebContents::FromJavaWebContents(java_web_contents);
405 return web_contents->WasRecentlyAudible();
406 }
OLDNEW
« no previous file with comments | « chrome/app/android/chrome_main_delegate_android.cc ('k') | chrome/browser/media/android/remote/remote_media_player_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698