| 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/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 1922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1933 #else | 1933 #else |
| 1934 NOTIMPLEMENTED(); | 1934 NOTIMPLEMENTED(); |
| 1935 #endif | 1935 #endif |
| 1936 } | 1936 } |
| 1937 | 1937 |
| 1938 void ChromeContentBrowserClient::RequestGeolocationPermission( | 1938 void ChromeContentBrowserClient::RequestGeolocationPermission( |
| 1939 content::WebContents* web_contents, | 1939 content::WebContents* web_contents, |
| 1940 int bridge_id, | 1940 int bridge_id, |
| 1941 const GURL& requesting_frame, | 1941 const GURL& requesting_frame, |
| 1942 bool user_gesture, | 1942 bool user_gesture, |
| 1943 base::Callback<void(bool)> result_callback, | 1943 base::Callback<void(int, bool)> result_callback, |
| 1944 base::Closure* cancel_callback) { | 1944 base::Closure* cancel_callback) { |
| 1945 GeolocationPermissionContextFactory::GetForProfile( | 1945 GeolocationPermissionContextFactory::GetForProfile( |
| 1946 Profile::FromBrowserContext(web_contents->GetBrowserContext()))-> | 1946 Profile::FromBrowserContext(web_contents->GetBrowserContext()))-> |
| 1947 RequestGeolocationPermission(web_contents, bridge_id, | 1947 RequestGeolocationPermission(web_contents, bridge_id, |
| 1948 requesting_frame, user_gesture, | 1948 requesting_frame, user_gesture, |
| 1949 result_callback, cancel_callback); | 1949 result_callback, cancel_callback); |
| 1950 } | 1950 } |
| 1951 | 1951 |
| 1952 void ChromeContentBrowserClient::RequestMidiSysExPermission( | 1952 void ChromeContentBrowserClient::RequestMidiSysExPermission( |
| 1953 content::WebContents* web_contents, | 1953 content::WebContents* web_contents, |
| (...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2640 switches::kDisableWebRtcEncryption, | 2640 switches::kDisableWebRtcEncryption, |
| 2641 }; | 2641 }; |
| 2642 to_command_line->CopySwitchesFrom(from_command_line, | 2642 to_command_line->CopySwitchesFrom(from_command_line, |
| 2643 kWebRtcDevSwitchNames, | 2643 kWebRtcDevSwitchNames, |
| 2644 arraysize(kWebRtcDevSwitchNames)); | 2644 arraysize(kWebRtcDevSwitchNames)); |
| 2645 } | 2645 } |
| 2646 } | 2646 } |
| 2647 #endif // defined(ENABLE_WEBRTC) | 2647 #endif // defined(ENABLE_WEBRTC) |
| 2648 | 2648 |
| 2649 } // namespace chrome | 2649 } // namespace chrome |
| OLD | NEW |