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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 871663003: media: Add MediaPermission interface and MediaPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove test code. Created 5 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
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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1944 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 #if defined(ENABLE_NOTIFICATIONS) 1955 #if defined(ENABLE_NOTIFICATIONS)
1956 context = DesktopNotificationServiceFactory::GetForProfile(profile); 1956 context = DesktopNotificationServiceFactory::GetForProfile(profile);
1957 #else 1957 #else
1958 NOTIMPLEMENTED(); 1958 NOTIMPLEMENTED();
1959 #endif 1959 #endif
1960 break; 1960 break;
1961 case content::PERMISSION_GEOLOCATION: 1961 case content::PERMISSION_GEOLOCATION:
1962 context = GeolocationPermissionContextFactory::GetForProfile(profile); 1962 context = GeolocationPermissionContextFactory::GetForProfile(profile);
1963 break; 1963 break;
1964 case content::PERMISSION_PROTECTED_MEDIA: 1964 case content::PERMISSION_PROTECTED_MEDIA:
1965 NOTIMPLEMENTED(); 1965 context = ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(
1966 profile);
1966 break; 1967 break;
1967 case content::PERMISSION_PUSH_MESSAGING: 1968 case content::PERMISSION_PUSH_MESSAGING:
1968 context = gcm::PushMessagingPermissionContextFactory::GetForProfile( 1969 context = gcm::PushMessagingPermissionContextFactory::GetForProfile(
1969 profile); 1970 profile);
1970 break; 1971 break;
1971 case content::PERMISSION_NUM: 1972 case content::PERMISSION_NUM:
1972 NOTREACHED() << "Invalid RequestPermission for " << permission; 1973 NOTREACHED() << "Invalid RequestPermission for " << permission;
1973 break; 1974 break;
1974 } 1975 }
1975 1976
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
2622 switches::kDisableWebRtcEncryption, 2623 switches::kDisableWebRtcEncryption,
2623 }; 2624 };
2624 to_command_line->CopySwitchesFrom(from_command_line, 2625 to_command_line->CopySwitchesFrom(from_command_line,
2625 kWebRtcDevSwitchNames, 2626 kWebRtcDevSwitchNames,
2626 arraysize(kWebRtcDevSwitchNames)); 2627 arraysize(kWebRtcDevSwitchNames));
2627 } 2628 }
2628 } 2629 }
2629 #endif // defined(ENABLE_WEBRTC) 2630 #endif // defined(ENABLE_WEBRTC)
2630 2631
2631 } // namespace chrome 2632 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698