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

Unified Diff: chrome/browser/profile.cc

Issue 455004: Keep incognito notification preferences separate from regular ones, and don't... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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/profile.cc
===================================================================
--- chrome/browser/profile.cc (revision 33305)
+++ chrome/browser/profile.cc (working copy)
@@ -448,7 +448,11 @@
}
virtual DesktopNotificationService* GetDesktopNotificationService() {
- return profile_->GetDesktopNotificationService();
+ if (!desktop_notification_service_.get()) {
+ desktop_notification_service_.reset(new DesktopNotificationService(
+ this, g_browser_process->notification_ui_manager()));
+ }
+ return desktop_notification_service_.get();
}
virtual ProfileSyncService* GetProfileSyncService() {
@@ -542,6 +546,9 @@
// The download manager that only stores downloaded items in memory.
scoped_refptr<DownloadManager> download_manager_;
+ // Use a separate desktop notification service for OTR.
+ scoped_ptr<DesktopNotificationService> desktop_notification_service_;
+
// Use a special WebKit context for OTR browsing.
scoped_refptr<WebKitContext> webkit_context_;

Powered by Google App Engine
This is Rietveld 408576698