OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ui/apps/chrome_app_delegate.h" | 5 #include "chrome/browser/ui/apps/chrome_app_delegate.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 was_blocked); | 249 was_blocked); |
250 } | 250 } |
251 | 251 |
252 content::ColorChooser* ChromeAppDelegate::ShowColorChooser( | 252 content::ColorChooser* ChromeAppDelegate::ShowColorChooser( |
253 content::WebContents* web_contents, | 253 content::WebContents* web_contents, |
254 SkColor initial_color) { | 254 SkColor initial_color) { |
255 return chrome::ShowColorChooser(web_contents, initial_color); | 255 return chrome::ShowColorChooser(web_contents, initial_color); |
256 } | 256 } |
257 | 257 |
258 void ChromeAppDelegate::RunFileChooser( | 258 void ChromeAppDelegate::RunFileChooser( |
259 content::WebContents* tab, | 259 content::RenderFrameHost* render_frame_host, |
260 const content::FileChooserParams& params) { | 260 const content::FileChooserParams& params) { |
261 FileSelectHelper::RunFileChooser(tab, params); | 261 FileSelectHelper::RunFileChooser(render_frame_host, params); |
262 } | 262 } |
263 | 263 |
264 void ChromeAppDelegate::RequestMediaAccessPermission( | 264 void ChromeAppDelegate::RequestMediaAccessPermission( |
265 content::WebContents* web_contents, | 265 content::WebContents* web_contents, |
266 const content::MediaStreamRequest& request, | 266 const content::MediaStreamRequest& request, |
267 const content::MediaResponseCallback& callback, | 267 const content::MediaResponseCallback& callback, |
268 const extensions::Extension* extension) { | 268 const extensions::Extension* extension) { |
269 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( | 269 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( |
270 web_contents, request, callback, extension); | 270 web_contents, request, callback, extension); |
271 } | 271 } |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 const content::NotificationDetails& details) { | 338 const content::NotificationDetails& details) { |
339 switch (type) { | 339 switch (type) { |
340 case chrome::NOTIFICATION_APP_TERMINATING: | 340 case chrome::NOTIFICATION_APP_TERMINATING: |
341 if (!terminating_callback_.is_null()) | 341 if (!terminating_callback_.is_null()) |
342 terminating_callback_.Run(); | 342 terminating_callback_.Run(); |
343 break; | 343 break; |
344 default: | 344 default: |
345 NOTREACHED() << "Received unexpected notification"; | 345 NOTREACHED() << "Received unexpected notification"; |
346 } | 346 } |
347 } | 347 } |
OLD | NEW |