chrome/browser/profiles/off_the_record_profile_impl.h - Issue 10873022: Revert 152904 - Moving FaviconService to a ProfileKeyedService.

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

Issue 10873022: Revert 152904 - Moving FaviconService to a ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 4 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

Property Changes:

Deleted: svn:mergeinfo

« no previous file with comments | « chrome/browser/jumplist_win.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('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 #ifndef CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_	5 #ifndef CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_

6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_	6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_

7	7

8 #include <string>	8 #include <string>

9	9

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

(...skipping 28 matching lines...) Expand all Loading...
39 virtual bool HasOffTheRecordProfile() OVERRIDE;	39 virtual bool HasOffTheRecordProfile() OVERRIDE;

40 virtual Profile* GetOriginalProfile() OVERRIDE;	40 virtual Profile* GetOriginalProfile() OVERRIDE;

41 virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE;	41 virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE;

42 virtual ExtensionService* GetExtensionService() OVERRIDE;	42 virtual ExtensionService* GetExtensionService() OVERRIDE;

43 virtual extensions::UserScriptMaster* GetUserScriptMaster() OVERRIDE;	43 virtual extensions::UserScriptMaster* GetUserScriptMaster() OVERRIDE;

44 virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE;	44 virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE;

45 virtual extensions::EventRouter* GetExtensionEventRouter() OVERRIDE;	45 virtual extensions::EventRouter* GetExtensionEventRouter() OVERRIDE;

46 virtual ExtensionSpecialStoragePolicy*	46 virtual ExtensionSpecialStoragePolicy*

47 GetExtensionSpecialStoragePolicy() OVERRIDE;	47 GetExtensionSpecialStoragePolicy() OVERRIDE;

48 virtual GAIAInfoUpdateService* GetGAIAInfoUpdateService() OVERRIDE;	48 virtual GAIAInfoUpdateService* GetGAIAInfoUpdateService() OVERRIDE;

	49 virtual FaviconService* GetFaviconService(ServiceAccessType sat) OVERRIDE;

49 virtual policy::UserCloudPolicyManager* GetUserCloudPolicyManager() OVERRIDE;	50 virtual policy::UserCloudPolicyManager* GetUserCloudPolicyManager() OVERRIDE;

50 virtual policy::PolicyService* GetPolicyService() OVERRIDE;	51 virtual policy::PolicyService* GetPolicyService() OVERRIDE;

51 virtual PrefService* GetPrefs() OVERRIDE;	52 virtual PrefService* GetPrefs() OVERRIDE;

52 virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;	53 virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;

53 virtual net::URLRequestContextGetter*	54 virtual net::URLRequestContextGetter*

54 GetRequestContextForExtensions() OVERRIDE;	55 GetRequestContextForExtensions() OVERRIDE;

55 virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp(	56 virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp(

56 const std::string& app_id) OVERRIDE;	57 const std::string& app_id) OVERRIDE;

57 virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;	58 virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;

58 virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;	59 virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
130 Time start_time_;	131 Time start_time_;

131	132

132 FilePath last_selected_directory_;	133 FilePath last_selected_directory_;

133	134

134 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;	135 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;

135	136

136 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);	137 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);

137 };	138 };

138	139

139 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_	140 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_

OLD	NEW