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

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

Issue 10546083: Convert ProtocolHandlerRegistry to be a ProfileKeyedService. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Respond to review comments. Fit and finish. Created 8 years, 6 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_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 IOThread* io_thread; 151 IOThread* io_thread;
152 scoped_refptr<CookieSettings> cookie_settings; 152 scoped_refptr<CookieSettings> cookie_settings;
153 scoped_refptr<net::SSLConfigService> ssl_config_service; 153 scoped_refptr<net::SSLConfigService> ssl_config_service;
154 scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate; 154 scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
155 scoped_refptr<ExtensionInfoMap> extension_info_map; 155 scoped_refptr<ExtensionInfoMap> extension_info_map;
156 156
157 #if defined(ENABLE_NOTIFICATIONS) 157 #if defined(ENABLE_NOTIFICATIONS)
158 DesktopNotificationService* notification_service; 158 DesktopNotificationService* notification_service;
159 #endif 159 #endif
160 160
161 scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry; 161 ProtocolHandlerRegistry* protocol_handler_registry;
162 // We need to initialize the ProxyConfigService from the UI thread 162 // We need to initialize the ProxyConfigService from the UI thread
163 // because on linux it relies on initializing things through gconf, 163 // because on linux it relies on initializing things through gconf,
164 // and needs to be on the main thread. 164 // and needs to be on the main thread.
165 scoped_ptr<net::ProxyConfigService> proxy_config_service; 165 scoped_ptr<net::ProxyConfigService> proxy_config_service;
166 // The profile this struct was populated from. It's passed as a void* to 166 // The profile this struct was populated from. It's passed as a void* to
167 // ensure it's not accidently used on the IO thread. Before using it on the 167 // ensure it's not accidently used on the IO thread. Before using it on the
168 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. 168 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
169 void* profile; 169 void* profile;
170 }; 170 };
171 171
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 347
348 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 348 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
349 bool initialized_on_UI_thread_; 349 bool initialized_on_UI_thread_;
350 350
351 bool is_incognito_; 351 bool is_incognito_;
352 352
353 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 353 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
354 }; 354 };
355 355
356 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 356 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698