Rearrange gyp files for Message Center

chrome/browser/notifications/notification_ui_manager.cc

 // 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.
 
 #include "chrome/browser/notifications/notification_ui_manager.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/notifications/balloon_notification_ui_manager.h"
+#include "chrome/common/chrome_switches.h"
+
+#if defined(ENABLE_MESSAGE_CENTER)
 #include "chrome/browser/notifications/message_center_notification_manager.h"
-#include "chrome/common/chrome_switches.h"
+#endif
 
 // static
 bool NotificationUIManager::DelegatesToMessageCenter() {
-#if defined(OS_WIN) || defined(OS_CHROMEOS)
+#if defined(ENABLE_MESSAGE_CENTER)
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableRichNotifications);
 #else
   return false;
 #endif
 }
 
 #if !defined(OS_MACOSX)
 // static
 NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) {
-  if (DelegatesToMessageCenter()) {
+#if defined(ENABLE_MESSAGE_CENTER)

[stevenjb, 2013/01/07 23:08:05]

This #if isn't really necessary since DelegatesToMessageCenter() will just
return false. (Less #if's is generally better)

[dewittj, 2013/01/08 23:50:01]

This #if is required as the code is currently written, since
MessageCenterNotificationManager is undefined when ENABLE_MESSAGE_CENTER is
false.  Even if DelegatesToMessageCenter returns false, the #if'd code will fail
to compile.

[stevenjb, 2013/01/08 23:59:50]

Ah, of course, Duh.

+  if (DelegatesToMessageCenter())
     return new MessageCenterNotificationManager();
-  } else {
-    BalloonNotificationUIManager* balloon_manager =
-        new BalloonNotificationUIManager(local_state);
-    balloon_manager->SetBalloonCollection(BalloonCollection::Create());
-    return balloon_manager;
-  }
+#endif
+  BalloonNotificationUIManager* balloon_manager =
+      new BalloonNotificationUIManager(local_state);
+  balloon_manager->SetBalloonCollection(BalloonCollection::Create());
+  return balloon_manager;
 }
 #endif