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/profiles/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
904 bool in_memory) { | 904 bool in_memory) { |
905 return io_data_ | 905 return io_data_ |
906 .GetIsolatedMediaRequestContextGetter(partition_path, in_memory).get(); | 906 .GetIsolatedMediaRequestContextGetter(partition_path, in_memory).get(); |
907 } | 907 } |
908 | 908 |
909 void ProfileImpl::RequestMidiSysExPermission( | 909 void ProfileImpl::RequestMidiSysExPermission( |
910 int render_process_id, | 910 int render_process_id, |
911 int render_view_id, | 911 int render_view_id, |
912 int bridge_id, | 912 int bridge_id, |
913 const GURL& requesting_frame, | 913 const GURL& requesting_frame, |
| 914 bool user_gesture, |
914 const MidiSysExPermissionCallback& callback) { | 915 const MidiSysExPermissionCallback& callback) { |
915 ChromeMidiPermissionContext* context = | 916 ChromeMidiPermissionContext* context = |
916 ChromeMidiPermissionContextFactory::GetForProfile(this); | 917 ChromeMidiPermissionContextFactory::GetForProfile(this); |
917 context->RequestMidiSysExPermission(render_process_id, | 918 context->RequestMidiSysExPermission(render_process_id, |
918 render_view_id, | 919 render_view_id, |
919 bridge_id, | 920 bridge_id, |
920 requesting_frame, | 921 requesting_frame, |
| 922 user_gesture, |
921 callback); | 923 callback); |
922 } | 924 } |
923 | 925 |
924 void ProfileImpl::CancelMidiSysExPermissionRequest( | 926 void ProfileImpl::CancelMidiSysExPermissionRequest( |
925 int render_process_id, | 927 int render_process_id, |
926 int render_view_id, | 928 int render_view_id, |
927 int bridge_id, | 929 int bridge_id, |
928 const GURL& requesting_frame) { | 930 const GURL& requesting_frame) { |
929 ChromeMidiPermissionContext* context = | 931 ChromeMidiPermissionContext* context = |
930 ChromeMidiPermissionContextFactory::GetForProfile(this); | 932 ChromeMidiPermissionContextFactory::GetForProfile(this); |
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1269 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1271 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
1270 #if defined(OS_CHROMEOS) | 1272 #if defined(OS_CHROMEOS) |
1271 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1273 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
1272 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1274 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
1273 g_browser_process->local_state()); | 1275 g_browser_process->local_state()); |
1274 } | 1276 } |
1275 #endif // defined(OS_CHROMEOS) | 1277 #endif // defined(OS_CHROMEOS) |
1276 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1278 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
1277 GetPrefs(), g_browser_process->local_state()); | 1279 GetPrefs(), g_browser_process->local_state()); |
1278 } | 1280 } |
OLD | NEW |