chrome/browser/profiles/off_the_record_profile_impl.cc - Issue 11243002: Move the bits of Prefs where production code has only trivially easy

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

Issue 11243002: Move the bits of Prefs where production code has only trivially easy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, fix gypi problem Created 8 years, 2 months 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/printing/cloud_print/cloud_print_proxy_service.h ('k') | chrome/browser/profiles/profile_impl.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/file_path.h"	10 #include "base/file_path.h"

11 #include "base/file_util.h"	11 #include "base/file_util.h"

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

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

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

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

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

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

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

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

19 #include "chrome/browser/chrome_plugin_service_filter.h"	20 #include "chrome/browser/chrome_plugin_service_filter.h"

20 #include "chrome/browser/content_settings/host_content_settings_map.h"	21 #include "chrome/browser/content_settings/host_content_settings_map.h"

21 #include "chrome/browser/download/chrome_download_manager_delegate.h"	22 #include "chrome/browser/download/chrome_download_manager_delegate.h"

22 #include "chrome/browser/download/download_service.h"	23 #include "chrome/browser/download/download_service.h"

23 #include "chrome/browser/download/download_service_factory.h"	24 #include "chrome/browser/download/download_service_factory.h"

(...skipping 10 matching lines...) Expand all Loading...
34 #include "chrome/browser/prefs/incognito_mode_prefs.h"	35 #include "chrome/browser/prefs/incognito_mode_prefs.h"

35 #include "chrome/browser/prefs/pref_service.h"	36 #include "chrome/browser/prefs/pref_service.h"

36 #include "chrome/browser/profiles/profile_dependency_manager.h"	37 #include "chrome/browser/profiles/profile_dependency_manager.h"

37 #include "chrome/browser/themes/theme_service.h"	38 #include "chrome/browser/themes/theme_service.h"

38 #include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"	39 #include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"

39 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"	40 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"

40 #include "chrome/common/chrome_constants.h"	41 #include "chrome/common/chrome_constants.h"

41 #include "chrome/common/chrome_paths.h"	42 #include "chrome/common/chrome_paths.h"

42 #include "chrome/common/chrome_switches.h"	43 #include "chrome/common/chrome_switches.h"

43 #include "chrome/common/extensions/extension.h"	44 #include "chrome/common/extensions/extension.h"

44 #include "chrome/common/json_pref_store.h"

45 #include "chrome/common/pref_names.h"	45 #include "chrome/common/pref_names.h"

46 #include "chrome/common/render_messages.h"	46 #include "chrome/common/render_messages.h"

47 #include "content/public/browser/browser_thread.h"	47 #include "content/public/browser/browser_thread.h"

48 #include "content/public/browser/host_zoom_map.h"	48 #include "content/public/browser/host_zoom_map.h"

49 #include "content/public/browser/notification_service.h"	49 #include "content/public/browser/notification_service.h"

50 #include "content/public/browser/notification_types.h"	50 #include "content/public/browser/notification_types.h"

51 #include "content/public/browser/render_process_host.h"	51 #include "content/public/browser/render_process_host.h"

52 #include "content/public/browser/web_contents.h"	52 #include "content/public/browser/web_contents.h"

53 #include "net/base/transport_security_state.h"	53 #include "net/base/transport_security_state.h"

54 #include "net/http/http_server_properties.h"	54 #include "net/http/http_server_properties.h"

(...skipping 451 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
506 if (!profile)	506 if (!profile)

507 profile = new OffTheRecordProfileImpl(this);	507 profile = new OffTheRecordProfileImpl(this);

508 profile->Init();	508 profile->Init();

509 return profile;	509 return profile;

510 }	510 }

511	511

512 base::Callback<ChromeURLDataManagerBackend*(void)>	512 base::Callback<ChromeURLDataManagerBackend*(void)>

513 OffTheRecordProfileImpl::GetChromeURLDataManagerBackendGetter() const {	513 OffTheRecordProfileImpl::GetChromeURLDataManagerBackendGetter() const {

514 return io_data_.GetChromeURLDataManagerBackendGetter();	514 return io_data_.GetChromeURLDataManagerBackendGetter();

515 }	515 }

OLD	NEW