Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

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

Issue 7384008: Revert 92668 - Remove more unnecessary ChromeURLRequestContext members. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.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_util.h" 15 #include "base/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/download_manager.h" 20 #include "chrome/browser/download/download_manager.h"
21 #include "chrome/browser/extensions/extension_info_map.h"
22 #include "chrome/browser/extensions/extension_message_service.h" 21 #include "chrome/browser/extensions/extension_message_service.h"
23 #include "chrome/browser/extensions/extension_pref_store.h" 22 #include "chrome/browser/extensions/extension_pref_store.h"
24 #include "chrome/browser/extensions/extension_process_manager.h" 23 #include "chrome/browser/extensions/extension_process_manager.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_webrequest_api.h"
28 #include "chrome/browser/net/pref_proxy_config_service.h" 26 #include "chrome/browser/net/pref_proxy_config_service.h"
29 #include "chrome/browser/prefs/pref_service.h" 27 #include "chrome/browser/prefs/pref_service.h"
30 #include "chrome/browser/profiles/off_the_record_profile_io_data.h" 28 #include "chrome/browser/profiles/off_the_record_profile_io_data.h"
31 #include "chrome/browser/profiles/profile_dependency_manager.h" 29 #include "chrome/browser/profiles/profile_dependency_manager.h"
32 #include "chrome/browser/sync/profile_sync_service.h" 30 #include "chrome/browser/sync/profile_sync_service.h"
33 #include "chrome/browser/themes/theme_service.h" 31 #include "chrome/browser/themes/theme_service.h"
34 #include "chrome/browser/transport_security_persister.h" 32 #include "chrome/browser/transport_security_persister.h"
35 #include "chrome/browser/ui/browser_list.h" 33 #include "chrome/browser/ui/browser_list.h"
36 #include "chrome/browser/ui/find_bar/find_bar_state.h" 34 #include "chrome/browser/ui/find_bar/find_bar_state.h"
37 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 35 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 } 672 }
675 return blob_storage_context_; 673 return blob_storage_context_;
676 } 674 }
677 675
678 virtual ExtensionInfoMap* GetExtensionInfoMap() { 676 virtual ExtensionInfoMap* GetExtensionInfoMap() {
679 return profile_->GetExtensionInfoMap(); 677 return profile_->GetExtensionInfoMap();
680 } 678 }
681 679
682 virtual ChromeURLDataManager* GetChromeURLDataManager() { 680 virtual ChromeURLDataManager* GetChromeURLDataManager() {
683 if (!chrome_url_data_manager_.get()) 681 if (!chrome_url_data_manager_.get())
684 chrome_url_data_manager_.reset(new ChromeURLDataManager( 682 chrome_url_data_manager_.reset(new ChromeURLDataManager(this));
685 io_data_.GetChromeURLDataManagerBackendGetter()));
686 return chrome_url_data_manager_.get(); 683 return chrome_url_data_manager_.get();
687 } 684 }
688 685
689 virtual PromoCounter* GetInstantPromoCounter() { 686 virtual PromoCounter* GetInstantPromoCounter() {
690 return NULL; 687 return NULL;
691 } 688 }
692 689
693 #if defined(OS_CHROMEOS) 690 #if defined(OS_CHROMEOS)
694 virtual void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) { 691 virtual void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) {
695 } 692 }
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 }; 844 };
848 #endif 845 #endif
849 846
850 Profile* Profile::CreateOffTheRecordProfile() { 847 Profile* Profile::CreateOffTheRecordProfile() {
851 #if defined(OS_CHROMEOS) 848 #if defined(OS_CHROMEOS)
852 if (Profile::IsGuestSession()) 849 if (Profile::IsGuestSession())
853 return new GuestSessionProfile(this); 850 return new GuestSessionProfile(this);
854 #endif 851 #endif
855 return new OffTheRecordProfileImpl(this); 852 return new OffTheRecordProfileImpl(this);
856 } 853 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_io_data.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698