| OLD | NEW |
| 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/ui/extensions/shell_window.h" | 5 #include "chrome/browser/ui/extensions/shell_window.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/browser/extensions/extension_process_manager.h" | 9 #include "chrome/browser/extensions/extension_process_manager.h" |
| 10 #include "chrome/browser/extensions/extension_system.h" | 10 #include "chrome/browser/extensions/extension_system.h" |
| 11 #include "chrome/browser/extensions/image_loader.h" | 11 #include "chrome/browser/extensions/image_loader.h" |
| 12 #include "chrome/browser/extensions/shell_window_geometry_cache.h" | 12 #include "chrome/browser/extensions/shell_window_geometry_cache.h" |
| 13 #include "chrome/browser/extensions/shell_window_registry.h" | 13 #include "chrome/browser/extensions/shell_window_registry.h" |
| 14 #include "chrome/browser/extensions/suggest_permission_util.h" | 14 #include "chrome/browser/extensions/suggest_permission_util.h" |
| 15 #include "chrome/browser/extensions/tab_helper.h" | 15 #include "chrome/browser/extensions/tab_helper.h" |
| 16 #include "chrome/browser/favicon/favicon_tab_helper.h" | 16 #include "chrome/browser/favicon/favicon_tab_helper.h" |
| 17 #include "chrome/browser/file_select_helper.h" | 17 #include "chrome/browser/file_select_helper.h" |
| 18 #include "chrome/browser/intents/web_intents_util.h" | 18 #include "chrome/browser/intents/web_intents_util.h" |
| 19 #include "chrome/browser/lifetime/application_lifetime.h" | 19 #include "chrome/browser/lifetime/application_lifetime.h" |
| 20 #include "chrome/browser/media/media_internals.h" | 20 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 21 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
| 22 #include "chrome/browser/sessions/session_id.h" | 22 #include "chrome/browser/sessions/session_id.h" |
| 23 #include "chrome/browser/ui/browser.h" | 23 #include "chrome/browser/ui/browser.h" |
| 24 #include "chrome/browser/ui/browser_finder.h" | 24 #include "chrome/browser/ui/browser_finder.h" |
| 25 #include "chrome/browser/ui/browser_tabstrip.h" | 25 #include "chrome/browser/ui/browser_tabstrip.h" |
| 26 #include "chrome/browser/ui/browser_window.h" | 26 #include "chrome/browser/ui/browser_window.h" |
| 27 #include "chrome/browser/ui/extensions/native_app_window.h" | 27 #include "chrome/browser/ui/extensions/native_app_window.h" |
| 28 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" | 28 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" |
| 29 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" | 29 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" |
| 30 #include "chrome/browser/view_type_utils.h" | 30 #include "chrome/browser/view_type_utils.h" |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 // Remove shutdown prevention. | 246 // Remove shutdown prevention. |
| 247 chrome::EndKeepAlive(); | 247 chrome::EndKeepAlive(); |
| 248 } | 248 } |
| 249 | 249 |
| 250 void ShellWindow::RequestMediaAccessPermission( | 250 void ShellWindow::RequestMediaAccessPermission( |
| 251 content::WebContents* web_contents, | 251 content::WebContents* web_contents, |
| 252 const content::MediaStreamRequest& request, | 252 const content::MediaStreamRequest& request, |
| 253 const content::MediaResponseCallback& callback) { | 253 const content::MediaResponseCallback& callback) { |
| 254 // Get the preferred default devices for the request. | 254 // Get the preferred default devices for the request. |
| 255 content::MediaStreamDevices devices; | 255 content::MediaStreamDevices devices; |
| 256 media::GetDefaultDevicesForProfile( | 256 MediaCaptureDevicesDispatcher::GetInstance()->GetDefaultDevicesForProfile( |
| 257 profile_, | 257 profile_, |
| 258 content::IsAudioMediaType(request.audio_type), | 258 content::IsAudioMediaType(request.audio_type), |
| 259 content::IsVideoMediaType(request.video_type), | 259 content::IsVideoMediaType(request.video_type), |
| 260 &devices); | 260 &devices); |
| 261 | 261 |
| 262 RequestMediaAccessPermissionHelper::AuthorizeRequest( | 262 RequestMediaAccessPermissionHelper::AuthorizeRequest( |
| 263 devices, request, callback, extension(), true); | 263 devices, request, callback, extension(), true); |
| 264 } | 264 } |
| 265 | 265 |
| 266 WebContents* ShellWindow::OpenURLFromTab(WebContents* source, | 266 WebContents* ShellWindow::OpenURLFromTab(WebContents* source, |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 const extensions::DraggableRegion& region = *iter; | 632 const extensions::DraggableRegion& region = *iter; |
| 633 sk_region->op( | 633 sk_region->op( |
| 634 region.bounds.x(), | 634 region.bounds.x(), |
| 635 region.bounds.y(), | 635 region.bounds.y(), |
| 636 region.bounds.right(), | 636 region.bounds.right(), |
| 637 region.bounds.bottom(), | 637 region.bounds.bottom(), |
| 638 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 638 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
| 639 } | 639 } |
| 640 return sk_region; | 640 return sk_region; |
| 641 } | 641 } |
| OLD | NEW |