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

Side by Side Diff: chrome/browser/ui/media_utils.cc

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)
Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/media_utils.h" 5 #include "chrome/browser/ui/media_utils.h"
6 6
7 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 7 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 10
11 #if defined(ENABLE_EXTENSIONS) 11 #if defined(ENABLE_EXTENSIONS)
12 #include "extensions/browser/extension_registry.h" 12 #include "extensions/browser/extension_registry.h"
13 #include "extensions/common/constants.h" 13 #include "extensions/common/constants.h"
14 #endif 14 #endif
15 15
16 namespace { 16 namespace {
17 17
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 ->CheckMediaAccessPermission( 57 ->CheckMediaAccessPermission(
58 web_contents, security_origin, type, extension); 58 web_contents, security_origin, type, extension);
59 } 59 }
60 return MediaCaptureDevicesDispatcher::GetInstance() 60 return MediaCaptureDevicesDispatcher::GetInstance()
61 ->CheckMediaAccessPermission(web_contents, security_origin, type); 61 ->CheckMediaAccessPermission(web_contents, security_origin, type);
62 #else 62 #else
63 return MediaCaptureDevicesDispatcher::GetInstance() 63 return MediaCaptureDevicesDispatcher::GetInstance()
64 ->CheckMediaAccessPermission(web_contents, security_origin, type); 64 ->CheckMediaAccessPermission(web_contents, security_origin, type);
65 #endif 65 #endif
66 } 66 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_media_menu_model.cc ('k') | chrome/browser/ui/tabs/tab_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698