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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 bool in_memory) { | 314 bool in_memory) { |
315 return io_data_->GetIsolatedAppRequestContextGetter(partition_path, in_memory) | 315 return io_data_->GetIsolatedAppRequestContextGetter(partition_path, in_memory) |
316 .get(); | 316 .get(); |
317 } | 317 } |
318 | 318 |
319 void OffTheRecordProfileImpl::RequestMidiSysExPermission( | 319 void OffTheRecordProfileImpl::RequestMidiSysExPermission( |
320 int render_process_id, | 320 int render_process_id, |
321 int render_view_id, | 321 int render_view_id, |
322 int bridge_id, | 322 int bridge_id, |
323 const GURL& requesting_frame, | 323 const GURL& requesting_frame, |
| 324 bool user_gesture, |
324 const MidiSysExPermissionCallback& callback) { | 325 const MidiSysExPermissionCallback& callback) { |
325 ChromeMidiPermissionContext* context = | 326 ChromeMidiPermissionContext* context = |
326 ChromeMidiPermissionContextFactory::GetForProfile(this); | 327 ChromeMidiPermissionContextFactory::GetForProfile(this); |
327 context->RequestMidiSysExPermission(render_process_id, | 328 context->RequestMidiSysExPermission(render_process_id, |
328 render_view_id, | 329 render_view_id, |
329 bridge_id, | 330 bridge_id, |
330 requesting_frame, | 331 requesting_frame, |
| 332 user_gesture, |
331 callback); | 333 callback); |
332 } | 334 } |
333 | 335 |
334 void OffTheRecordProfileImpl::CancelMidiSysExPermissionRequest( | 336 void OffTheRecordProfileImpl::CancelMidiSysExPermissionRequest( |
335 int render_process_id, | 337 int render_process_id, |
336 int render_view_id, | 338 int render_view_id, |
337 int bridge_id, | 339 int bridge_id, |
338 const GURL& requesting_frame) { | 340 const GURL& requesting_frame) { |
339 ChromeMidiPermissionContext* context = | 341 ChromeMidiPermissionContext* context = |
340 ChromeMidiPermissionContextFactory::GetForProfile(this); | 342 ChromeMidiPermissionContextFactory::GetForProfile(this); |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { | 568 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { |
567 #if defined(OS_CHROMEOS) | 569 #if defined(OS_CHROMEOS) |
568 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 570 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
569 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 571 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
570 g_browser_process->local_state()); | 572 g_browser_process->local_state()); |
571 } | 573 } |
572 #endif // defined(OS_CHROMEOS) | 574 #endif // defined(OS_CHROMEOS) |
573 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 575 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
574 GetPrefs(), g_browser_process->local_state()); | 576 GetPrefs(), g_browser_process->local_state()); |
575 } | 577 } |
OLD | NEW |