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

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

Issue 7125006: Get rid of Chrome notifications dependency, and instead go through ContentBrowserClient to show U... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix browsertest Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_io_data.cc
===================================================================
--- chrome/browser/profiles/profile_io_data.cc (revision 88079)
+++ chrome/browser/profiles/profile_io_data.cc (working copy)
@@ -25,6 +25,7 @@
#include "chrome/browser/net/metadata_url_request.h"
#include "chrome/browser/net/pref_proxy_config_service.h"
#include "chrome/browser/net/proxy_service_factory.h"
+#include "chrome/browser/notifications/desktop_notification_service_factory.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/profiles/profile.h"
@@ -249,6 +250,8 @@
params->file_system_context = profile->GetFileSystemContext();
params->quota_manager = profile->GetQuotaManager();
params->extension_info_map = profile->GetExtensionInfoMap();
+ params->notification_service =
+ DesktopNotificationServiceFactory::GetForProfile(profile);
prerender::PrerenderManager* prerender_manager =
profile->GetPrerenderManager();
if (prerender_manager)
@@ -360,10 +363,18 @@
return resource_context_;
}
+ExtensionInfoMap* ProfileIOData::GetExtensionInfoMap() const {
+ return extension_info_map_;
+}
+
HostContentSettingsMap* ProfileIOData::GetHostContentSettingsMap() const {
return host_content_settings_map_;
}
+DesktopNotificationService* ProfileIOData::GetNotificationService() const {
+ return notification_service_;
+}
+
ProfileIOData::ResourceContext::ResourceContext(const ProfileIOData* io_data)
: io_data_(io_data) {
DCHECK(io_data);
@@ -465,6 +476,7 @@
quota_manager_ = profile_params_->quota_manager;
host_zoom_map_ = profile_params_->host_zoom_map;
host_content_settings_map_ = profile_params_->host_content_settings_map;
+ notification_service_ = profile_params_->notification_service;
extension_info_map_ = profile_params_->extension_info_map;
prerender_manager_ = profile_params_->prerender_manager;

Powered by Google App Engine
This is Rietveld 408576698