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

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

Issue 61323002: Fix broken threading model in CheckDesktopNotificationPermission (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Even more merge conflicts.. Created 7 years, 1 month 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
Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index b835b2b59b37955af9f1e25a1e09e79b84bfb07e..3dce3ffb02bc2fc20763ca1b2c5d2d9f0bf35de9 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -29,7 +29,6 @@
class ChromeHttpUserAgentSettings;
class ChromeNetworkDelegate;
class CookieSettings;
-class DesktopNotificationService;
class HostContentSettingsMap;
class ManagedModeURLFilter;
class Profile;
@@ -120,10 +119,6 @@ class ProfileIOData {
CookieSettings* GetCookieSettings() const;
HostContentSettingsMap* GetHostContentSettingsMap() const;
-#if defined(ENABLE_NOTIFICATIONS)
- DesktopNotificationService* GetNotificationService() const;
-#endif
-
IntegerPrefMember* session_startup_pref() const {
return &session_startup_pref_;
}
@@ -257,10 +252,6 @@ class ProfileIOData {
scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver>
resource_prefetch_predictor_observer_;
-#if defined(ENABLE_NOTIFICATIONS)
- DesktopNotificationService* notification_service;
-#endif
-
// This pointer exists only as a means of conveying a url job factory
// pointer from the protocol handler registry on the UI thread to the
// the URLRequestContext on the IO thread. The consumer MUST take
@@ -504,10 +495,6 @@ class ProfileIOData {
mutable scoped_ptr<net::CertVerifier> cert_verifier_;
#endif
-#if defined(ENABLE_NOTIFICATIONS)
- mutable DesktopNotificationService* notification_service_;
-#endif
-
mutable scoped_ptr<net::TransportSecurityPersister>
transport_security_persister_;
« no previous file with comments | « chrome/browser/notifications/desktop_notification_service_unittest.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698