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

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

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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
OLDNEW
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 net::URLRequestContextGetter* GetRequestContextForExtensions() override; 53 net::URLRequestContextGetter* GetRequestContextForExtensions() override;
54 net::URLRequestContextGetter* CreateRequestContext( 54 net::URLRequestContextGetter* CreateRequestContext(
55 content::ProtocolHandlerMap* protocol_handlers, 55 content::ProtocolHandlerMap* protocol_handlers,
56 content::URLRequestInterceptorScopedVector request_interceptors) override; 56 content::URLRequestInterceptorScopedVector request_interceptors) override;
57 net::URLRequestContextGetter* CreateRequestContextForStoragePartition( 57 net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
58 const base::FilePath& partition_path, 58 const base::FilePath& partition_path,
59 bool in_memory, 59 bool in_memory,
60 content::ProtocolHandlerMap* protocol_handlers, 60 content::ProtocolHandlerMap* protocol_handlers,
61 content::URLRequestInterceptorScopedVector request_interceptors) override; 61 content::URLRequestInterceptorScopedVector request_interceptors) override;
62 net::SSLConfigService* GetSSLConfigService() override; 62 net::SSLConfigService* GetSSLConfigService() override;
63 HostContentSettingsMap* GetHostContentSettingsMap() override;
64 bool IsSameProfile(Profile* profile) override; 63 bool IsSameProfile(Profile* profile) override;
65 Time GetStartTime() const override; 64 Time GetStartTime() const override;
66 base::FilePath last_selected_directory() override; 65 base::FilePath last_selected_directory() override;
67 void set_last_selected_directory(const base::FilePath& path) override; 66 void set_last_selected_directory(const base::FilePath& path) override;
68 bool WasCreatedByVersionOrLater(const std::string& version) override; 67 bool WasCreatedByVersionOrLater(const std::string& version) override;
69 void SetExitType(ExitType exit_type) override; 68 void SetExitType(ExitType exit_type) override;
70 ExitType GetLastSessionExitType() override; 69 ExitType GetLastSessionExitType() override;
71 70
72 #if defined(OS_CHROMEOS) 71 #if defined(OS_CHROMEOS)
73 void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) override; 72 void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) override;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 Time start_time_; 137 Time start_time_;
139 138
140 base::FilePath last_selected_directory_; 139 base::FilePath last_selected_directory_;
141 140
142 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 141 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
143 142
144 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 143 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
145 }; 144 };
146 145
147 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 146 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/profile_resetter/profile_resetter_unittest.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698