Fixed Build breaks while notification is enabled and extension is disabled.

chrome/browser/notifications/desktop_notification_service.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 40 matching lines @@
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 // Callback to be invoked when the result of a permission request is known.
 typedef base::Callback<void(blink::WebNotificationPermission)>
     NotificationPermissionCallback;
 
 // 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_EXTENSION)

[dewittj, 2014/09/19 17:33:05]

This should be ENABLE_EXTENSIONS

[Jitu( very slow this week), 2014/09/22 05:49:44]

Done.

+                                   ,
+                                   public extensions::ExtensionRegistryObserver

[stevenjb, 2014/09/18 17:56:08]

Ugh, this sort of #ifdef tends to be error prone.
I notice that we are still including  #include
"extensions/browser/extension_registry_observer.h".
Can we leave the class dependency and just #ifdef out the code inside the
implementation in the .cc file?

[Jun Mukai, 2014/09/18 18:07:13]

I am okay with this.  Factoring-out the observer would be cleaner for the coding
though.

[dewittj, 2014/09/18 19:24:45]

Seems to me that this is a temporary state of affairs anyway, since Peter is
planning to move the extension code into a separate service.

+#endif
+                                   {
  public:
   // Register profile-specific prefs of notifications.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* prefs);
 
     // Add a desktop notification.
   static std::string AddIconNotification(const GURL& origin_url,
                                          const base::string16& title,
                                          const base::string16& message,
                                          const gfx::Image& icon,
                                          const base::string16& replace_id,
@@ skipping 49 matching lines @@
   // Used as a callback once a permission has been decided to convert |allowed|
   // to one of the blink::WebNotificationPermission values.
   void OnNotificationPermissionRequested(
       const base::Callback<void(blink::WebNotificationPermission)>& callback,
       bool allowed);
 
   void FirePermissionLevelChangedEvent(
       const message_center::NotifierId& notifier_id,
       bool enabled);
 
+#if defined(ENABLED_EXTENSIONS)

[dewittj, 2014/09/19 17:33:05]

This should be ENABLE_EXTENSIONS

[Jitu( very slow this week), 2014/09/22 05:49:44]

Done.

   // 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_;
 
   // Prefs listener for disabled_extension_id.
   StringListPrefMember disabled_extension_id_pref_;
 
   // Prefs listener for disabled_system_component_id.
   StringListPrefMember disabled_system_component_id_pref_;
 
   // On-memory data for the availability of extensions.
   std::set<std::string> disabled_extension_ids_;
 
   // On-memory data for the availability of system_component.
   std::set<std::string> disabled_system_component_ids_;
 
+#if defined(ENABLED_EXTENSIONS)

[dewittj, 2014/09/19 17:33:05]

This should be ENABLE_EXTENSIONS

[Jitu( very slow this week), 2014/09/22 05:49:44]

Done.

   // 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_;
 
   base::WeakPtrFactory<DesktopNotificationService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_