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

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

Issue 9416070: Move creation and ownership of HostZoomMap to content instead of having every embedder do this. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac/cros browsertests Created 8 years, 10 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) 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 // This class gathers state related to a single user profile. 5 // This class gathers state related to a single user profile.
6 6
7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
8 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 8 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
9 #pragma once 9 #pragma once
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 static void RegisterUserPrefs(PrefService* prefs); 50 static void RegisterUserPrefs(PrefService* prefs);
51 51
52 // content::BrowserContext implementation: 52 // content::BrowserContext implementation:
53 virtual FilePath GetPath() OVERRIDE; 53 virtual FilePath GetPath() OVERRIDE;
54 virtual content::DownloadManager* GetDownloadManager() OVERRIDE; 54 virtual content::DownloadManager* GetDownloadManager() OVERRIDE;
55 virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE; 55 virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
56 virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess( 56 virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
57 int renderer_child_id) OVERRIDE; 57 int renderer_child_id) OVERRIDE;
58 virtual net::URLRequestContextGetter* GetRequestContextForMedia() OVERRIDE; 58 virtual net::URLRequestContextGetter* GetRequestContextForMedia() OVERRIDE;
59 virtual content::ResourceContext* GetResourceContext() OVERRIDE; 59 virtual content::ResourceContext* GetResourceContext() OVERRIDE;
60 virtual content::HostZoomMap* GetHostZoomMap() OVERRIDE;
61 virtual content::GeolocationPermissionContext* 60 virtual content::GeolocationPermissionContext*
62 GetGeolocationPermissionContext() OVERRIDE; 61 GetGeolocationPermissionContext() OVERRIDE;
63 virtual content::SpeechInputPreferences* GetSpeechInputPreferences() OVERRIDE; 62 virtual content::SpeechInputPreferences* GetSpeechInputPreferences() OVERRIDE;
64 virtual bool DidLastSessionExitCleanly() OVERRIDE; 63 virtual bool DidLastSessionExitCleanly() OVERRIDE;
65 virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE; 64 virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
66 65
67 // Profile implementation: 66 // Profile implementation:
68 virtual std::string GetProfileName() OVERRIDE; 67 virtual std::string GetProfileName() OVERRIDE;
69 virtual bool IsOffTheRecord() OVERRIDE; 68 virtual bool IsOffTheRecord() OVERRIDE;
70 virtual Profile* GetOffTheRecordProfile() OVERRIDE; 69 virtual Profile* GetOffTheRecordProfile() OVERRIDE;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 141
143 private: 142 private:
144 friend class Profile; 143 friend class Profile;
145 144
146 ProfileImpl(const FilePath& path, 145 ProfileImpl(const FilePath& path,
147 Profile::Delegate* delegate); 146 Profile::Delegate* delegate);
148 147
149 // Does final initialization. Should be called after prefs were loaded. 148 // Does final initialization. Should be called after prefs were loaded.
150 void DoFinalInit(); 149 void DoFinalInit();
151 150
151 void InitHostZoomMap();
152
152 // Does final prefs initialization and calls Init(). 153 // Does final prefs initialization and calls Init().
153 void OnPrefsLoaded(bool success); 154 void OnPrefsLoaded(bool success);
154 155
155 void CreateWebDataService(); 156 void CreateWebDataService();
156 FilePath GetPrefFilePath(); 157 FilePath GetPrefFilePath();
157 158
158 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX) 159 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)
159 LocalProfileId GetLocalProfileId(); 160 LocalProfileId GetLocalProfileId();
160 #endif 161 #endif
161 162
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 scoped_ptr<TemplateURLFetcher> template_url_fetcher_; 226 scoped_ptr<TemplateURLFetcher> template_url_fetcher_;
226 scoped_ptr<BookmarkModel> bookmark_bar_model_; 227 scoped_ptr<BookmarkModel> bookmark_bar_model_;
227 scoped_refptr<PromoResourceService> promo_resource_service_; 228 scoped_refptr<PromoResourceService> promo_resource_service_;
228 scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_; 229 scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_;
229 230
230 scoped_ptr<TokenService> token_service_; 231 scoped_ptr<TokenService> token_service_;
231 232
232 scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_; 233 scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
233 234
234 scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 235 scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
235 scoped_refptr<content::HostZoomMap> host_zoom_map_;
236 scoped_refptr<content::GeolocationPermissionContext> 236 scoped_refptr<content::GeolocationPermissionContext>
237 geolocation_permission_context_; 237 geolocation_permission_context_;
238 scoped_refptr<content::SpeechInputPreferences> speech_input_preferences_; 238 scoped_refptr<content::SpeechInputPreferences> speech_input_preferences_;
239 scoped_refptr<UserStyleSheetWatcher> user_style_sheet_watcher_; 239 scoped_refptr<UserStyleSheetWatcher> user_style_sheet_watcher_;
240 scoped_ptr<GAIAInfoUpdateService> gaia_info_update_service_; 240 scoped_ptr<GAIAInfoUpdateService> gaia_info_update_service_;
241 scoped_refptr<HistoryService> history_service_; 241 scoped_refptr<HistoryService> history_service_;
242 scoped_ptr<FaviconService> favicon_service_; 242 scoped_ptr<FaviconService> favicon_service_;
243 scoped_ptr<AutocompleteClassifier> autocomplete_classifier_; 243 scoped_ptr<AutocompleteClassifier> autocomplete_classifier_;
244 scoped_refptr<history::ShortcutsBackend> shortcuts_backend_; 244 scoped_refptr<history::ShortcutsBackend> shortcuts_backend_;
245 scoped_refptr<WebDataService> web_data_service_; 245 scoped_refptr<WebDataService> web_data_service_;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 Profile::Delegate* delegate_; 296 Profile::Delegate* delegate_;
297 297
298 chrome_browser_net::Predictor* predictor_; 298 chrome_browser_net::Predictor* predictor_;
299 299
300 bool session_restore_enabled_; 300 bool session_restore_enabled_;
301 301
302 DISALLOW_COPY_AND_ASSIGN(ProfileImpl); 302 DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
303 }; 303 };
304 304
305 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 305 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl_unittest.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698