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: Reduce differences between orig and updated test. Trying to figure out why tests fail on try server… 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_unittest.cc ('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 #pragma once	7 #pragma once

8	8

9 #include <string>	9 #include <string>

10	10

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61 virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;	61 virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;

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

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

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

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

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

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

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

69 virtual void MarkAsCleanShutdown() OVERRIDE;	69 virtual void MarkAsCleanShutdown() OVERRIDE;

70 virtual void InitPromoResources() OVERRIDE;	70 virtual void InitPromoResources() OVERRIDE;

71 virtual void InitRegisteredProtocolHandlers() OVERRIDE;

72 virtual FilePath last_selected_directory() OVERRIDE;	71 virtual FilePath last_selected_directory() OVERRIDE;

73 virtual void set_last_selected_directory(const FilePath& path) OVERRIDE;	72 virtual void set_last_selected_directory(const FilePath& path) OVERRIDE;

74 virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE;	73 virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE;

75	74

76 #if defined(OS_CHROMEOS)	75 #if defined(OS_CHROMEOS)

77 virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE;	76 virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE;

78 virtual void InitChromeOSPreferences() OVERRIDE;	77 virtual void InitChromeOSPreferences() OVERRIDE;

79	78

80 virtual void ChangeAppLocale(const std::string& locale,	79 virtual void ChangeAppLocale(const std::string& locale,

81 AppLocaleChangedVia) OVERRIDE;	80 AppLocaleChangedVia) OVERRIDE;

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

135	134

136 FilePath last_selected_directory_;	135 FilePath last_selected_directory_;

137	136

138 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;	137 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;

139	138

140 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);	139 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);

141 };	140 };

142	141

143 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_	142 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_

OLD	NEW