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/off_the_record_profile_impl.h" | 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 bool in_memory) { | 298 bool in_memory) { |
299 return io_data_.GetIsolatedAppRequestContextGetter(partition_path, in_memory) | 299 return io_data_.GetIsolatedAppRequestContextGetter(partition_path, in_memory) |
300 .get(); | 300 .get(); |
301 } | 301 } |
302 | 302 |
303 void OffTheRecordProfileImpl::RequestMidiSysExPermission( | 303 void OffTheRecordProfileImpl::RequestMidiSysExPermission( |
304 int render_process_id, | 304 int render_process_id, |
305 int render_view_id, | 305 int render_view_id, |
306 int bridge_id, | 306 int bridge_id, |
307 const GURL& requesting_frame, | 307 const GURL& requesting_frame, |
| 308 bool user_gesture, |
308 const MidiSysExPermissionCallback& callback) { | 309 const MidiSysExPermissionCallback& callback) { |
309 ChromeMidiPermissionContext* context = | 310 ChromeMidiPermissionContext* context = |
310 ChromeMidiPermissionContextFactory::GetForProfile(this); | 311 ChromeMidiPermissionContextFactory::GetForProfile(this); |
311 context->RequestMidiSysExPermission(render_process_id, | 312 context->RequestMidiSysExPermission(render_process_id, |
312 render_view_id, | 313 render_view_id, |
313 bridge_id, | 314 bridge_id, |
314 requesting_frame, | 315 requesting_frame, |
| 316 user_gesture, |
315 callback); | 317 callback); |
316 } | 318 } |
317 | 319 |
318 void OffTheRecordProfileImpl::CancelMidiSysExPermissionRequest( | 320 void OffTheRecordProfileImpl::CancelMidiSysExPermissionRequest( |
319 int render_process_id, | 321 int render_process_id, |
320 int render_view_id, | 322 int render_view_id, |
321 int bridge_id, | 323 int bridge_id, |
322 const GURL& requesting_frame) { | 324 const GURL& requesting_frame) { |
323 ChromeMidiPermissionContext* context = | 325 ChromeMidiPermissionContext* context = |
324 ChromeMidiPermissionContextFactory::GetForProfile(this); | 326 ChromeMidiPermissionContextFactory::GetForProfile(this); |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
542 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { | 544 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { |
543 #if defined(OS_CHROMEOS) | 545 #if defined(OS_CHROMEOS) |
544 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 546 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
545 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 547 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
546 g_browser_process->local_state()); | 548 g_browser_process->local_state()); |
547 } | 549 } |
548 #endif // defined(OS_CHROMEOS) | 550 #endif // defined(OS_CHROMEOS) |
549 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 551 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
550 GetPrefs(), g_browser_process->local_state()); | 552 GetPrefs(), g_browser_process->local_state()); |
551 } | 553 } |
OLD | NEW |