chrome/browser/profiles/off_the_record_profile_impl.h - Issue 10546083: Convert ProtocolHandlerRegistry to be a ProfileKeyedService.

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

Issue 10546083: Convert ProtocolHandlerRegistry to be a ProfileKeyedService. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Respond to jhawkins' comments. 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

« chrome/browser/custom_handlers/protocol_handler_registry.h ('K') | « chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »
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 #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 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59 virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;	59 virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;

60 virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;	60 virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;

61 virtual BookmarkModel* GetBookmarkModel() OVERRIDE;	61 virtual BookmarkModel* GetBookmarkModel() OVERRIDE;

62 virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry() OVERRIDE;	62 virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry() OVERRIDE;

63 virtual bool IsSameProfile(Profile* profile) OVERRIDE;	63 virtual bool IsSameProfile(Profile* profile) OVERRIDE;

64 virtual Time GetStartTime() const OVERRIDE;	64 virtual Time GetStartTime() const OVERRIDE;

65 virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE;	65 virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE;

66 virtual history::TopSites* GetTopSites() OVERRIDE;	66 virtual history::TopSites* GetTopSites() OVERRIDE;

67 virtual void MarkAsCleanShutdown() OVERRIDE;	67 virtual void MarkAsCleanShutdown() OVERRIDE;

68 virtual void InitPromoResources() OVERRIDE;	68 virtual void InitPromoResources() OVERRIDE;

69 virtual void InitRegisteredProtocolHandlers() OVERRIDE;

70 virtual FilePath last_selected_directory() OVERRIDE;	69 virtual FilePath last_selected_directory() OVERRIDE;

71 virtual void set_last_selected_directory(const FilePath& path) OVERRIDE;	70 virtual void set_last_selected_directory(const FilePath& path) OVERRIDE;

72 virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE;	71 virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE;

73	72

74 #if defined(OS_CHROMEOS)	73 #if defined(OS_CHROMEOS)

75 virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE;	74 virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE;

76 virtual void InitChromeOSPreferences() OVERRIDE;	75 virtual void InitChromeOSPreferences() OVERRIDE;

77	76

78 virtual void ChangeAppLocale(const std::string& locale,	77 virtual void ChangeAppLocale(const std::string& locale,

79 AppLocaleChangedVia) OVERRIDE;	78 AppLocaleChangedVia) OVERRIDE;

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

133	132

134 FilePath last_selected_directory_;	133 FilePath last_selected_directory_;

135	134

136 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;	135 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;

137	136

138 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);	137 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);

139 };	138 };

140	139

141 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_	140 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_

OLD	NEW