chrome/browser/profiles/profile_impl.cc - Issue 10704052: Download filename determination refactor (3/3)

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

Issue 10704052: Download filename determination refactor (3/3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge with r147256 Created 8 years, 5 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

« chrome/browser/download/download_test_observer.h ('K') | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/ui/browser_close_browsertest.cc » ('j') | chrome/browser/ui/browser_close_browsertest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/command_line.h"	8 #include "base/command_line.h"

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/environment.h"	10 #include "base/environment.h"

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

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

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

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

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

16 #include "base/string_tokenizer.h"	16 #include "base/string_tokenizer.h"

17 #include "base/string_util.h"	17 #include "base/string_util.h"

18 #include "base/stringprintf.h"	18 #include "base/stringprintf.h"

19 #include "base/utf_string_conversions.h"	19 #include "base/utf_string_conversions.h"

20 #include "base/version.h"	20 #include "base/version.h"

21 #include "chrome/browser/autocomplete/autocomplete_classifier.h"	21 #include "chrome/browser/autocomplete/autocomplete_classifier.h"

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

23 #include "chrome/browser/background/background_mode_manager.h"	23 #include "chrome/browser/background/background_mode_manager.h"

24 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	24 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

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

26 #include "chrome/browser/chrome_plugin_service_filter.h"	26 #include "chrome/browser/chrome_plugin_service_filter.h"

27 #include "chrome/browser/content_settings/cookie_settings.h"	27 #include "chrome/browser/content_settings/cookie_settings.h"

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

29 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"	29 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"

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

30 #include "chrome/browser/download/download_service.h"	31 #include "chrome/browser/download/download_service.h"

31 #include "chrome/browser/download/download_service_factory.h"	32 #include "chrome/browser/download/download_service_factory.h"

32 #include "chrome/browser/extensions/extension_event_router.h"	33 #include "chrome/browser/extensions/extension_event_router.h"

33 #include "chrome/browser/extensions/extension_pref_store.h"	34 #include "chrome/browser/extensions/extension_pref_store.h"

34 #include "chrome/browser/extensions/extension_pref_value_map.h"	35 #include "chrome/browser/extensions/extension_pref_value_map.h"

35 #include "chrome/browser/extensions/extension_pref_value_map_factory.h"	36 #include "chrome/browser/extensions/extension_pref_value_map_factory.h"

36 #include "chrome/browser/extensions/extension_process_manager.h"	37 #include "chrome/browser/extensions/extension_process_manager.h"

37 #include "chrome/browser/extensions/extension_service.h"	38 #include "chrome/browser/extensions/extension_service.h"

38 #include "chrome/browser/extensions/extension_special_storage_policy.h"	39 #include "chrome/browser/extensions/extension_special_storage_policy.h"

39 #include "chrome/browser/extensions/extension_system.h"	40 #include "chrome/browser/extensions/extension_system.h"

(...skipping 1061 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1101 if (!path.empty())	1102 if (!path.empty())

1102 *cache_path = path;	1103 *cache_path = path;

1103 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :	1104 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :

1104 prefs_->GetInteger(prefs::kDiskCacheSize);	1105 prefs_->GetInteger(prefs::kDiskCacheSize);

1105 }	1106 }

1106	1107

1107 base::Callback<ChromeURLDataManagerBackend*(void)>	1108 base::Callback<ChromeURLDataManagerBackend*(void)>

1108 ProfileImpl::GetChromeURLDataManagerBackendGetter() const {	1109 ProfileImpl::GetChromeURLDataManagerBackendGetter() const {

1109 return io_data_.GetChromeURLDataManagerBackendGetter();	1110 return io_data_.GetChromeURLDataManagerBackendGetter();

1110 }	1111 }

OLD	NEW