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

Side by Side Diff: android_webview/native/aw_web_contents_delegate.cc

Issue 1552723002: Convert Pass()→std::move() in //android_webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « android_webview/native/aw_dev_tools_server.cc ('k') | android_webview/native/cookie_manager.cc » ('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 "android_webview/native/aw_web_contents_delegate.h" 5 #include "android_webview/native/aw_web_contents_delegate.h"
6 6
7 #include "android_webview/browser/aw_javascript_dialog_manager.h" 7 #include "android_webview/browser/aw_javascript_dialog_manager.h"
8 #include "android_webview/browser/find_helper.h" 8 #include "android_webview/browser/find_helper.h"
9 #include "android_webview/native/aw_contents.h" 9 #include "android_webview/native/aw_contents.h"
10 #include "android_webview/native/aw_contents_io_thread_client_impl.h" 10 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 } 226 }
227 227
228 void AwWebContentsDelegate::RequestMediaAccessPermission( 228 void AwWebContentsDelegate::RequestMediaAccessPermission(
229 WebContents* web_contents, 229 WebContents* web_contents,
230 const content::MediaStreamRequest& request, 230 const content::MediaStreamRequest& request,
231 const content::MediaResponseCallback& callback) { 231 const content::MediaResponseCallback& callback) {
232 AwContents* aw_contents = AwContents::FromWebContents(web_contents); 232 AwContents* aw_contents = AwContents::FromWebContents(web_contents);
233 if (!aw_contents) { 233 if (!aw_contents) {
234 callback.Run(content::MediaStreamDevices(), 234 callback.Run(content::MediaStreamDevices(),
235 content::MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN, 235 content::MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN,
236 scoped_ptr<content::MediaStreamUI>().Pass()); 236 scoped_ptr<content::MediaStreamUI>());
237 return; 237 return;
238 } 238 }
239 aw_contents->GetPermissionRequestHandler()->SendRequest( 239 aw_contents->GetPermissionRequestHandler()->SendRequest(
240 scoped_ptr<AwPermissionRequestDelegate>( 240 scoped_ptr<AwPermissionRequestDelegate>(
241 new MediaAccessPermissionRequest(request, callback))); 241 new MediaAccessPermissionRequest(request, callback)));
242 } 242 }
243 243
244 void AwWebContentsDelegate::EnterFullscreenModeForTab( 244 void AwWebContentsDelegate::EnterFullscreenModeForTab(
245 content::WebContents* web_contents, const GURL& origin) { 245 content::WebContents* web_contents, const GURL& origin) {
246 WebContentsDelegateAndroid::EnterFullscreenModeForTab(web_contents, origin); 246 WebContentsDelegateAndroid::EnterFullscreenModeForTab(web_contents, origin);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 DVLOG(0) << "File Chooser result: mode = " << mode 307 DVLOG(0) << "File Chooser result: mode = " << mode
308 << ", file paths = " << base::JoinString(file_path_str, ":"); 308 << ", file paths = " << base::JoinString(file_path_str, ":");
309 rvh->FilesSelectedInChooser(files, mode); 309 rvh->FilesSelectedInChooser(files, mode);
310 } 310 }
311 311
312 bool RegisterAwWebContentsDelegate(JNIEnv* env) { 312 bool RegisterAwWebContentsDelegate(JNIEnv* env) {
313 return RegisterNativesImpl(env); 313 return RegisterNativesImpl(env);
314 } 314 }
315 315
316 } // namespace android_webview 316 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/aw_dev_tools_server.cc ('k') | android_webview/native/cookie_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698