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

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

Issue 1601323002: Use GetLastCommittedOrigin instead of GetLastCommittedURL in bluetooth chooser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed bluetooth test at: requestDevice.html Created 4 years, 11 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/tab_web_contents_delegate_android.h" 5 #include "chrome/browser/android/tab_web_contents_delegate_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 source, to_different_document); 115 source, to_different_document);
116 LoadProgressChanged(source, has_stopped ? 1 : 0); 116 LoadProgressChanged(source, has_stopped ? 1 : 0);
117 } 117 }
118 118
119 void TabWebContentsDelegateAndroid::RunFileChooser( 119 void TabWebContentsDelegateAndroid::RunFileChooser(
120 WebContents* web_contents, 120 WebContents* web_contents,
121 const FileChooserParams& params) { 121 const FileChooserParams& params) {
122 FileSelectHelper::RunFileChooser(web_contents, params); 122 FileSelectHelper::RunFileChooser(web_contents, params);
123 } 123 }
124 124
125 scoped_ptr<BluetoothChooser> 125 scoped_ptr<BluetoothChooser> TabWebContentsDelegateAndroid::RunBluetoothChooser(
126 TabWebContentsDelegateAndroid::RunBluetoothChooser(
127 content::WebContents* web_contents, 126 content::WebContents* web_contents,
128 const BluetoothChooser::EventHandler& event_handler, 127 const BluetoothChooser::EventHandler& event_handler,
129 const GURL& origin) { 128 const url::Origin& origin) {
130 return make_scoped_ptr( 129 return make_scoped_ptr(
131 new BluetoothChooserAndroid(web_contents, event_handler, origin)); 130 new BluetoothChooserAndroid(web_contents, event_handler, origin));
132 } 131 }
133 132
134 void TabWebContentsDelegateAndroid::CloseContents( 133 void TabWebContentsDelegateAndroid::CloseContents(
135 WebContents* web_contents) { 134 WebContents* web_contents) {
136 // Prevent dangling registrations assigned to closed web contents. 135 // Prevent dangling registrations assigned to closed web contents.
137 if (notification_registrar_.IsRegistered(this, 136 if (notification_registrar_.IsRegistered(this,
138 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, 137 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE,
139 content::Source<WebContents>(web_contents))) { 138 content::Source<WebContents>(web_contents))) {
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 jboolean IsCapturingVideo(JNIEnv* env, 483 jboolean IsCapturingVideo(JNIEnv* env,
485 const JavaParamRef<jclass>& clazz, 484 const JavaParamRef<jclass>& clazz,
486 const JavaParamRef<jobject>& java_web_contents) { 485 const JavaParamRef<jobject>& java_web_contents) {
487 content::WebContents* web_contents = 486 content::WebContents* web_contents =
488 content::WebContents::FromJavaWebContents(java_web_contents); 487 content::WebContents::FromJavaWebContents(java_web_contents);
489 scoped_refptr<MediaStreamCaptureIndicator> indicator = 488 scoped_refptr<MediaStreamCaptureIndicator> indicator =
490 MediaCaptureDevicesDispatcher::GetInstance()-> 489 MediaCaptureDevicesDispatcher::GetInstance()->
491 GetMediaStreamCaptureIndicator(); 490 GetMediaStreamCaptureIndicator();
492 return indicator->IsCapturingVideo(web_contents); 491 return indicator->IsCapturingVideo(web_contents);
493 } 492 }
OLDNEW
« no previous file with comments | « chrome/browser/android/tab_web_contents_delegate_android.h ('k') | chrome/browser/ui/android/bluetooth_chooser_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698