chrome/browser/profiles/profile_impl.h - Issue 11689004: Move PromoResourceService from Profile to BrowserProcessImpl/local_state().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/profile_impl.h

Issue 11689004: Move PromoResourceService from Profile to BrowserProcessImpl/local_state(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: android x 4 Created 8 years 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/browser_process_impl.cc ('K') | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | chrome/browser/web_resource/notification_promo.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_impl.h

diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h

index e461908c7ec75cd36cccdd5b44e68726c36bce5c..b9c19912120e6983bcef569c71d63b30380d1b62 100644

--- a/chrome/browser/profiles/profile_impl.h

+++ b/chrome/browser/profiles/profile_impl.h

@@ -23,7 +23,6 @@

class NetPrefObserver;

class PrefServiceSyncable;

class PrefServiceBase;

-class PromoResourceService;

class SSLConfigServiceManager;

#if defined(OS_CHROMEOS)

@@ -111,7 +110,6 @@ class ProfileImpl : public Profile,

virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry() OVERRIDE;

virtual bool IsSameProfile(Profile* profile) OVERRIDE;

virtual base::Time GetStartTime() const OVERRIDE;

- virtual void InitPromoResources() OVERRIDE;

virtual FilePath last_selected_directory() OVERRIDE;

virtual void set_last_selected_directory(const FilePath& path) OVERRIDE;

virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;

@@ -220,15 +218,14 @@ class ProfileImpl : public Profile,

scoped_ptr<policy::PolicyService> policy_service_;

// Keep |prefs_| on top for destruction order because |extension_prefs_|,

- // |net_pref_observer_|, |promo_resource_service_|, |io_data_| an others store

- // pointers to |prefs_| and shall be destructed first.

+ // |net_pref_observer_|, |io_data_| an others store pointers to |prefs_| and

+ // shall be destructed first.

scoped_ptr<PrefServiceSyncable> prefs_;

scoped_ptr<PrefServiceSyncable> otr_prefs_;

ProfileImplIOData::Handle io_data_;

scoped_refptr<ExtensionSpecialStoragePolicy>

extension_special_storage_policy_;

scoped_ptr<NetPrefObserver> net_pref_observer_;

- scoped_refptr<PromoResourceService> promo_resource_service_;

scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;

scoped_refptr<HostContentSettingsMap> host_content_settings_map_;

scoped_refptr<content::GeolocationPermissionContext>