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 921 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
932 bool in_memory) { | 932 bool in_memory) { |
933 return io_data_ | 933 return io_data_ |
934 .GetIsolatedMediaRequestContextGetter(partition_path, in_memory).get(); | 934 .GetIsolatedMediaRequestContextGetter(partition_path, in_memory).get(); |
935 } | 935 } |
936 | 936 |
937 void ProfileImpl::RequestMidiSysExPermission( | 937 void ProfileImpl::RequestMidiSysExPermission( |
938 int render_process_id, | 938 int render_process_id, |
939 int render_view_id, | 939 int render_view_id, |
940 int bridge_id, | 940 int bridge_id, |
941 const GURL& requesting_frame, | 941 const GURL& requesting_frame, |
| 942 bool user_gesture, |
942 const MidiSysExPermissionCallback& callback) { | 943 const MidiSysExPermissionCallback& callback) { |
943 ChromeMidiPermissionContext* context = | 944 ChromeMidiPermissionContext* context = |
944 ChromeMidiPermissionContextFactory::GetForProfile(this); | 945 ChromeMidiPermissionContextFactory::GetForProfile(this); |
945 context->RequestMidiSysExPermission(render_process_id, | 946 context->RequestMidiSysExPermission(render_process_id, |
946 render_view_id, | 947 render_view_id, |
947 bridge_id, | 948 bridge_id, |
948 requesting_frame, | 949 requesting_frame, |
| 950 user_gesture, |
949 callback); | 951 callback); |
950 } | 952 } |
951 | 953 |
952 void ProfileImpl::CancelMidiSysExPermissionRequest( | 954 void ProfileImpl::CancelMidiSysExPermissionRequest( |
953 int render_process_id, | 955 int render_process_id, |
954 int render_view_id, | 956 int render_view_id, |
955 int bridge_id, | 957 int bridge_id, |
956 const GURL& requesting_frame) { | 958 const GURL& requesting_frame) { |
957 ChromeMidiPermissionContext* context = | 959 ChromeMidiPermissionContext* context = |
958 ChromeMidiPermissionContextFactory::GetForProfile(this); | 960 ChromeMidiPermissionContextFactory::GetForProfile(this); |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1301 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1303 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
1302 #if defined(OS_CHROMEOS) | 1304 #if defined(OS_CHROMEOS) |
1303 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1305 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
1304 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1306 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
1305 g_browser_process->local_state()); | 1307 g_browser_process->local_state()); |
1306 } | 1308 } |
1307 #endif // defined(OS_CHROMEOS) | 1309 #endif // defined(OS_CHROMEOS) |
1308 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1310 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
1309 GetPrefs(), g_browser_process->local_state()); | 1311 GetPrefs(), g_browser_process->local_state()); |
1310 } | 1312 } |
OLD | NEW |