Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

trunk/src/chrome/browser/notifications/sync_notifier/synced_notification.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/sync_notifier/synced_notification.h"
 
 #include "base/basictypes.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_delegate.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/synced_notification_specifics.pb.h"
+#if defined(ENABLE_MESSAGE_CENTER)
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/notification_types.h"
+#endif  // ENABLE_MESSAGE_CENTER
 
 namespace {
 const char kExtensionScheme[] = "chrome-extension://";
 
 bool UseRichNotifications() {
+#if defined(ENABLE_MESSAGE_CENTER)
   return message_center::IsRichNotificationEnabled();
+#else  // ENABLE_MESSAGE_CENTER
+  return false;
+#endif  // ENABLE_MESSAGE_CENTER
 }
 
 }  // namespace
 
 namespace notifier {
 
 COMPILE_ASSERT(static_cast<sync_pb::CoalescedSyncedNotification_ReadState>(
                    SyncedNotification::kUnread) ==
                sync_pb::CoalescedSyncedNotification_ReadState_UNREAD,
                local_enum_must_match_protobuf_enum);
@@ skipping 43 matching lines @@
   // I change the interface to let NotificationUIManager know the right way.
   if (SyncedNotification::kRead == GetReadState() ||
       SyncedNotification::kDismissed == GetReadState() ) {
     DVLOG(2) << "Dismissed notification arrived"
              << GetHeading() << " " << GetText();
     return;
   }
 
   // Some inputs and fields are only used if there is a notification center.
   if (UseRichNotifications()) {
+
+#if defined(ENABLE_MESSAGE_CENTER)
     double creation_time = static_cast<double>(GetCreationTime());
     int priority = GetPriority();
     int notification_count = GetNotificationCount();
     int button_count = GetButtonCount();
     // TODO(petewil): Refactor this for an arbitrary number of buttons.
     std::string button_one_title = GetButtonOneTitle();
     std::string button_one_icon_url = GetButtonOneIconUrl();
     std::string button_two_title = GetButtonTwoTitle();
     std::string button_two_icon_url = GetButtonTwoIconUrl();
 
@@ skipping 50 matching lines @@
                                  GetAppIconUrl(),
                                  heading,
                                  text,
                                  WebKit::WebTextDirectionDefault,
                                  display_source,
                                  replace_key,
                                  &optional_fields,
                                  delegate);
 
     notification_manager->Add(ui_notification, profile);
+#endif  // ENABLE_MESSAGE_CENTER
+
   } else {
 
     Notification ui_notification(GetOriginUrl(),
                                  GetAppIconUrl(),
                                  heading,
                                  text,
                                  WebKit::WebTextDirectionDefault,
                                  display_source,
                                  replace_key,
                                  delegate);
@@ skipping 155 matching lines @@
     return 0;
 
   return specifics_.coalesced_notification().creation_time_msec();
 }
 
 int SyncedNotification::GetPriority() const {
   if (!specifics_.coalesced_notification().has_priority())
     return kUndefinedPriority;
   int protobuf_priority = specifics_.coalesced_notification().priority();
 
+#if defined(ENABLE_MESSAGE_CENTER)
   // Convert the prioroty to the scheme used by the notification center.
   if (protobuf_priority ==
       sync_pb::CoalescedSyncedNotification_Priority_LOW) {
     return message_center::LOW_PRIORITY;
   } else if (protobuf_priority ==
              sync_pb::CoalescedSyncedNotification_Priority_STANDARD) {
     return message_center::DEFAULT_PRIORITY;
   } else if (protobuf_priority ==
              sync_pb::CoalescedSyncedNotification_Priority_HIGH) {
     return message_center::HIGH_PRIORITY;
   } else {
     // Complain if this is a new priority we have not seen before.
     DCHECK(protobuf_priority <
            sync_pb::CoalescedSyncedNotification_Priority_LOW  ||
            sync_pb::CoalescedSyncedNotification_Priority_HIGH <
            protobuf_priority);
     return kUndefinedPriority;
   }
+
+#else // ENABLE_MESSAGE_CENTER
+  return protobuf_priority;
+
+#endif // ENABLE_MESSAGE_CENTER
 }
 
 int SyncedNotification::GetNotificationCount() const {
   return specifics_.coalesced_notification().render_info().
       expanded_info().collapsed_info_size();
 }
 
 int SyncedNotification::GetButtonCount() const {
   return specifics_.coalesced_notification().render_info().collapsed_info().
       target_size();
@@ skipping 112 matching lines @@
     int index) const {
   if (specifics_.coalesced_notification().render_info().expanded_info().
       collapsed_info_size() < index + 1)
     return std::string();
 
   return specifics_.coalesced_notification().render_info().expanded_info().
       collapsed_info(index).simple_collapsed_layout().description();
 }
 
 }  // namespace notifier