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

Unified Diff: chrome/browser/notifications/desktop_notification_service.h

Issue 582673002: Fixed Build breaks while notification is enabled and extension is disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 3 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/notifications/desktop_notification_service.h
diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h
index 47457e55926155451f0cae5f83392a5966b33112..bba760b7846482fb87338381b86c54402708491f 100644
--- a/chrome/browser/notifications/desktop_notification_service.h
+++ b/chrome/browser/notifications/desktop_notification_service.h
@@ -21,12 +21,15 @@
#include "chrome/browser/notifications/extension_welcome_notification.h"
#include "components/content_settings/core/common/content_settings.h"
#include "components/keyed_service/core/keyed_service.h"
-#include "extensions/browser/extension_registry_observer.h"
#include "third_party/WebKit/public/platform/WebNotificationPermission.h"
#include "third_party/WebKit/public/web/WebTextDirection.h"
#include "ui/message_center/notifier_settings.h"
#include "url/gurl.h"
+#if defined(ENABLE_EXTENSIONS)
+#include "extensions/browser/extension_registry_observer.h"
+#endif
+
class Notification;
class NotificationDelegate;
class NotificationUIManager;
@@ -38,9 +41,11 @@ class RenderFrameHost;
struct ShowDesktopNotificationHostMsgParams;
}
+#if defined(ENABLE_EXTENSIONS)
namespace extensions {
class ExtensionRegistry;
}
+#endif
namespace gfx {
class Image;
@@ -56,9 +61,12 @@ typedef base::Callback<void(blink::WebNotificationPermission)>
// The DesktopNotificationService is an object, owned by the Profile,
// which provides the creation of desktop "toasts" to web pages and workers.
-class DesktopNotificationService
- : public PermissionContextBase,
- public extensions::ExtensionRegistryObserver {
+class DesktopNotificationService : public PermissionContextBase
+#if defined(ENABLE_EXTENSIONS)
+ ,
+ public extensions::ExtensionRegistryObserver
+#endif
+ {
public:
// Register profile-specific prefs of notifications.
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* prefs);
@@ -128,11 +136,13 @@ class DesktopNotificationService
const message_center::NotifierId& notifier_id,
bool enabled);
+#if defined(ENABLE_EXTENSIONS)
// extensions::ExtensionRegistryObserver:
virtual void OnExtensionUninstalled(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
extensions::UninstallReason reason) OVERRIDE;
+#endif
// The profile which owns this object.
Profile* profile_;
@@ -149,10 +159,12 @@ class DesktopNotificationService
// On-memory data for the availability of system_component.
std::set<std::string> disabled_system_component_ids_;
+#if defined(ENABLE_EXTENSIONS)
// An observer to listen when extension is uninstalled.
ScopedObserver<extensions::ExtensionRegistry,
extensions::ExtensionRegistryObserver>
extension_registry_observer_;
+#endif
// Welcome Notification
scoped_ptr<ExtensionWelcomeNotification> chrome_now_welcome_notification_;
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/notifications/desktop_notification_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698