chrome/browser/profiles/off_the_record_profile_impl.cc - Issue 63933003: Moved ExtensionInfoMap and ExtensionsQuotaService to extensions/

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 63933003: Moved ExtensionInfoMap and ExtensionsQuotaService to extensions/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comment fix Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/notifications/message_center_notification_manager.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

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"

11 #include "base/memory/scoped_ptr.h"	11 #include "base/memory/scoped_ptr.h"

12 #include "base/path_service.h"	12 #include "base/path_service.h"

13 #include "base/prefs/json_pref_store.h"	13 #include "base/prefs/json_pref_store.h"

14 #include "base/strings/string_number_conversions.h"	14 #include "base/strings/string_number_conversions.h"

15 #include "base/strings/string_util.h"	15 #include "base/strings/string_util.h"

16 #include "build/build_config.h"	16 #include "build/build_config.h"

17 #include "chrome/browser/background/background_contents_service_factory.h"	17 #include "chrome/browser/background/background_contents_service_factory.h"

18 #include "chrome/browser/browser_process.h"	18 #include "chrome/browser/browser_process.h"

19 #include "chrome/browser/content_settings/host_content_settings_map.h"	19 #include "chrome/browser/content_settings/host_content_settings_map.h"

20 #include "chrome/browser/download/chrome_download_manager_delegate.h"	20 #include "chrome/browser/download/chrome_download_manager_delegate.h"

21 #include "chrome/browser/download/download_service.h"	21 #include "chrome/browser/download/download_service.h"

22 #include "chrome/browser/download/download_service_factory.h"	22 #include "chrome/browser/download/download_service_factory.h"

23 #include "chrome/browser/extensions/api/web_request/web_request_api.h"	23 #include "chrome/browser/extensions/api/web_request/web_request_api.h"

24 #include "chrome/browser/extensions/extension_info_map.h"

25 #include "chrome/browser/extensions/extension_service.h"	24 #include "chrome/browser/extensions/extension_service.h"

26 #include "chrome/browser/extensions/extension_special_storage_policy.h"	25 #include "chrome/browser/extensions/extension_special_storage_policy.h"

27 #include "chrome/browser/extensions/extension_system.h"	26 #include "chrome/browser/extensions/extension_system.h"

28 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"	27 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"

29 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_facto ry.h"	28 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_facto ry.h"

30 #include "chrome/browser/io_thread.h"	29 #include "chrome/browser/io_thread.h"

31 #include "chrome/browser/media/chrome_midi_permission_context.h"	30 #include "chrome/browser/media/chrome_midi_permission_context.h"

32 #include "chrome/browser/media/chrome_midi_permission_context_factory.h"	31 #include "chrome/browser/media/chrome_midi_permission_context_factory.h"

33 #include "chrome/browser/net/pref_proxy_config_tracker.h"	32 #include "chrome/browser/net/pref_proxy_config_tracker.h"

34 #include "chrome/browser/net/proxy_service_factory.h"	33 #include "chrome/browser/net/proxy_service_factory.h"

(...skipping 470 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
505 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {	504 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {

506 #if defined(OS_CHROMEOS)	505 #if defined(OS_CHROMEOS)

507 if (chromeos::ProfileHelper::IsSigninProfile(this)) {	506 if (chromeos::ProfileHelper::IsSigninProfile(this)) {

508 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(	507 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(

509 g_browser_process->local_state());	508 g_browser_process->local_state());

510 }	509 }

511 #endif // defined(OS_CHROMEOS)	510 #endif // defined(OS_CHROMEOS)

512 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(	511 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(

513 GetPrefs(), g_browser_process->local_state());	512 GetPrefs(), g_browser_process->local_state());

514 }	513 }

OLD	NEW