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

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

Issue 2059533002: Change WebContentsDelegate::RunFileChooser to be frame based. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes based on reviews. Created 4 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 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 110
111 void TabWebContentsDelegateAndroid::LoadingStateChanged( 111 void TabWebContentsDelegateAndroid::LoadingStateChanged(
112 WebContents* source, bool to_different_document) { 112 WebContents* source, bool to_different_document) {
113 bool has_stopped = source == NULL || !source->IsLoading(); 113 bool has_stopped = source == NULL || !source->IsLoading();
114 WebContentsDelegateAndroid::LoadingStateChanged( 114 WebContentsDelegateAndroid::LoadingStateChanged(
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 content::RenderFrameHost* render_frame_host,
121 const FileChooserParams& params) { 121 const FileChooserParams& params) {
122 FileSelectHelper::RunFileChooser(web_contents, params); 122 FileSelectHelper::RunFileChooser(render_frame_host, params);
123 } 123 }
124 124
125 std::unique_ptr<BluetoothChooser> 125 std::unique_ptr<BluetoothChooser>
126 TabWebContentsDelegateAndroid::RunBluetoothChooser( 126 TabWebContentsDelegateAndroid::RunBluetoothChooser(
127 content::RenderFrameHost* frame, 127 content::RenderFrameHost* frame,
128 const BluetoothChooser::EventHandler& event_handler) { 128 const BluetoothChooser::EventHandler& event_handler) {
129 return base::WrapUnique(new BluetoothChooserAndroid(frame, event_handler)); 129 return base::WrapUnique(new BluetoothChooserAndroid(frame, event_handler));
130 } 130 }
131 131
132 void TabWebContentsDelegateAndroid::CloseContents( 132 void TabWebContentsDelegateAndroid::CloseContents(
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 jboolean IsCapturingVideo(JNIEnv* env, 482 jboolean IsCapturingVideo(JNIEnv* env,
483 const JavaParamRef<jclass>& clazz, 483 const JavaParamRef<jclass>& clazz,
484 const JavaParamRef<jobject>& java_web_contents) { 484 const JavaParamRef<jobject>& java_web_contents) {
485 content::WebContents* web_contents = 485 content::WebContents* web_contents =
486 content::WebContents::FromJavaWebContents(java_web_contents); 486 content::WebContents::FromJavaWebContents(java_web_contents);
487 scoped_refptr<MediaStreamCaptureIndicator> indicator = 487 scoped_refptr<MediaStreamCaptureIndicator> indicator =
488 MediaCaptureDevicesDispatcher::GetInstance()-> 488 MediaCaptureDevicesDispatcher::GetInstance()->
489 GetMediaStreamCaptureIndicator(); 489 GetMediaStreamCaptureIndicator();
490 return indicator->IsCapturingVideo(web_contents); 490 return indicator->IsCapturingVideo(web_contents);
491 } 491 }
OLDNEW
« no previous file with comments | « chrome/browser/android/tab_web_contents_delegate_android.h ('k') | chrome/browser/devtools/devtools_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698