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

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

Issue 25492006: Makes the response to CheckNotificationPermission asynchronous. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | content/browser/renderer_host/render_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 8caf7f39de4e63054fc085b2013d80cd784aff0a..836dd4824e5f9905efa4e64ef2008ab6d0d95744 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -46,7 +46,6 @@
#include "chrome/browser/net/proxy_service_factory.h"
#include "chrome/browser/net/resource_prefetch_predictor_observer.h"
#include "chrome/browser/net/transport_security_persister.h"
-#include "chrome/browser/notifications/desktop_notification_service_factory.h"
#include "chrome/browser/policy/url_blacklist_manager.h"
#include "chrome/browser/predictors/resource_prefetch_predictor.h"
#include "chrome/browser/predictors/resource_prefetch_predictor_factory.h"
@@ -60,7 +59,6 @@
#include "components/startup_metric_utils/startup_metric_utils.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/host_zoom_map.h"
-#include "content/public/browser/notification_service.h"
#include "content/public/browser/resource_context.h"
#include "extensions/common/constants.h"
#include "net/cert/cert_verifier.h"
@@ -270,11 +268,6 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
new chrome_browser_net::ResourcePrefetchPredictorObserver(predictor));
}
-#if defined(ENABLE_NOTIFICATIONS)
- params->notification_service =
- DesktopNotificationServiceFactory::GetForProfile(profile);
-#endif
-
ProtocolHandlerRegistry* protocol_handler_registry =
ProtocolHandlerRegistryFactory::GetForProfile(profile);
DCHECK(protocol_handler_registry);
@@ -402,20 +395,12 @@ void ProfileIOData::AppRequestContext::SetJobFactory(
ProfileIOData::AppRequestContext::~AppRequestContext() {}
ProfileIOData::ProfileParams::ProfileParams()
- : io_thread(NULL),
-#if defined(ENABLE_NOTIFICATIONS)
- notification_service(NULL),
-#endif
- profile(NULL) {
-}
+ : io_thread(NULL), profile(NULL) {}
ProfileIOData::ProfileParams::~ProfileParams() {}
ProfileIOData::ProfileIOData(bool is_incognito)
: initialized_(false),
-#if defined(ENABLE_NOTIFICATIONS)
- notification_service_(NULL),
-#endif
resource_context_(new ResourceContext(this)),
load_time_stats_(NULL),
initialized_on_UI_thread_(false),
@@ -636,13 +621,6 @@ HostContentSettingsMap* ProfileIOData::GetHostContentSettingsMap() const {
return host_content_settings_map_.get();
}
-#if defined(ENABLE_NOTIFICATIONS)
-DesktopNotificationService* ProfileIOData::GetNotificationService() const {
- DCHECK(initialized_);
- return notification_service_;
-}
-#endif
-
void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
#if defined(OS_CHROMEOS)
@@ -805,9 +783,6 @@ void ProfileIOData::Init(content::ProtocolHandlerMap* protocol_handlers) const {
// Take ownership over these parameters.
cookie_settings_ = profile_params_->cookie_settings;
host_content_settings_map_ = profile_params_->host_content_settings_map;
-#if defined(ENABLE_NOTIFICATIONS)
- notification_service_ = profile_params_->notification_service;
-#endif
extension_info_map_ = profile_params_->extension_info_map;
resource_context_->host_resolver_ = io_thread_globals->host_resolver.get();
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | content/browser/renderer_host/render_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698