Remove ENABLE_MESSAGE_CENTER

chrome/browser/extensions/api/notifications/notifications_api.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/extensions/api/notifications/notifications_api.h"
 
 #include "base/callback.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/features/feature.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "googleurl/src/gurl.h"
+#include "ui/message_center/message_center_util.h"
 
 namespace extensions {
 
 namespace {
 
 const char kResultKey[] = "result";
 
 class NotificationsApiDelegate : public NotificationDelegate {
  public:
   NotificationsApiDelegate(ApiFunction* api_function,
@@ skipping 100 matching lines @@
 
   return true;
 }
 
 NotificationsApiFunction::NotificationsApiFunction() {
 }
 
 NotificationsApiFunction::~NotificationsApiFunction() {
 }
 
-// If older notification runtime is used, MessageCenter is not built.
-// Use simpler bridge then, ignoring all options.
-#if !defined (ENABLE_MESSAGE_CENTER)
 void NotificationsApiFunction::CreateNotification(
     const std::string& id,
     api::notifications::NotificationOptions* options) {
-  message_center::NotificationType type =
-      MapApiTemplateTypeToType(options->type);
-  GURL icon_url(UTF8ToUTF16(options->icon_url));
-  string16 title(UTF8ToUTF16(options->title));
-  string16 message(UTF8ToUTF16(options->message));
+  // If older notification runtime is used, use simpler bridge.
+  if (message_center::IsRichNotificationEnabled()) {

[dewittj, 2013/05/08 18:53:01]

need a "!" in the conditional?

[Dmitry Titov, 2013/05/08 23:03:26]

oops. Done. Tested that Galore works :-)

+    message_center::NotificationType type =
+        MapApiTemplateTypeToType(options->type);
+    GURL icon_url(UTF8ToUTF16(options->icon_url));
+    string16 title(UTF8ToUTF16(options->title));
+    string16 message(UTF8ToUTF16(options->message));
 
-  // Ignore options if running on the old notification runtime.
-  scoped_ptr<DictionaryValue> optional_fields(new DictionaryValue());
+    // Ignore options if running on the old notification runtime.
+    scoped_ptr<DictionaryValue> optional_fields(new DictionaryValue());
 
-  NotificationsApiDelegate* api_delegate(new NotificationsApiDelegate(
-      this,
-      profile(),
-      extension_->id(),
-      id));  // ownership is passed to Notification
-  Notification notification(type, extension_->url(), icon_url, title, message,
-                            WebKit::WebTextDirectionDefault,
-                            UTF8ToUTF16(extension_->name()),
-                            UTF8ToUTF16(api_delegate->id()),
-                            optional_fields.get(), api_delegate);
+    NotificationsApiDelegate* api_delegate(new NotificationsApiDelegate(
+        this,
+        profile(),
+        extension_->id(),
+        id));  // ownership is passed to Notification
+    Notification notification(type, extension_->url(), icon_url, title, message,
+                              WebKit::WebTextDirectionDefault,
+                              UTF8ToUTF16(extension_->name()),
+                              UTF8ToUTF16(api_delegate->id()),
+                              optional_fields.get(), api_delegate);
 
-  g_browser_process->notification_ui_manager()->Add(notification, profile());
+    g_browser_process->notification_ui_manager()->Add(notification, profile());

[dewittj, 2013/05/08 18:53:01]

put a return here to buy one level of indentation for the remaining code in the
function.

[Dmitry Titov, 2013/05/08 23:03:26]

Done.

+  } else {
+    message_center::NotificationType type =
+        MapApiTemplateTypeToType(options->type);
+    GURL icon_url(UTF8ToUTF16(options->icon_url));
+    string16 title(UTF8ToUTF16(options->title));
+    string16 message(UTF8ToUTF16(options->message));
+
+    scoped_ptr<DictionaryValue> optional_fields(new DictionaryValue());
+
+    // For all notification types.
+    if (options->priority.get())
+      optional_fields->SetInteger(message_center::kPriorityKey,
+                                  *options->priority);
+    if (options->event_time.get())
+      optional_fields->SetDouble(message_center::kTimestampKey,
+                                 *options->event_time);
+    if (options->buttons.get()) {
+      if (options->buttons->size() > 0) {
+        linked_ptr<api::notifications::NotificationButton> button =
+            (*options->buttons)[0];
+        optional_fields->SetString(message_center::kButtonOneTitleKey,
+                                   UTF8ToUTF16(button->title));
+        if (button->icon_url.get())
+          optional_fields->SetString(message_center::kButtonOneIconUrlKey,
+                                     UTF8ToUTF16(*button->icon_url));
+      }
+      if (options->buttons->size() > 1) {
+        linked_ptr<api::notifications::NotificationButton> button =
+            (*options->buttons)[1];
+        optional_fields->SetString(message_center::kButtonTwoTitleKey,
+                                   UTF8ToUTF16(button->title));
+        if (button->icon_url.get())
+          optional_fields->SetString(message_center::kButtonTwoIconUrlKey,
+                                     UTF8ToUTF16(*button->icon_url));
+      }
+    }
+    if (options->expanded_message.get())
+      optional_fields->SetString(message_center::kExpandedMessageKey,
+                                 UTF8ToUTF16(*options->expanded_message));
+
+    // For image notifications (type == 'image').
+    // TODO(dharcourt): Fail if (type == 'image' && !options->image_url.get())
+    // TODO(dharcourt): Fail if (type != 'image' && options->image_url.get())
+    if (options->image_url.get())
+      optional_fields->SetString(message_center::kImageUrlKey,
+                                 UTF8ToUTF16(*options->image_url));
+
+    // For list notifications (type == 'multiple').
+    // TODO(dharcourt): Fail if (type == 'multiple' && !options->items.get())
+    // TODO(dharcourt): Fail if (type != 'multiple' && options->items.get())
+    if (options->items.get()) {
+      base::ListValue* items = new base::ListValue();
+      std::vector<
+        linked_ptr<
+          api::notifications::NotificationItem> >::iterator i;
+      for (i = options->items->begin(); i != options->items->end(); ++i) {
+        base::DictionaryValue* item = new base::DictionaryValue();
+        item->SetString(message_center::kItemTitleKey,
+                        UTF8ToUTF16(i->get()->title));
+        item->SetString(message_center::kItemMessageKey,
+                        UTF8ToUTF16(i->get()->message));
+        items->Append(item);
+      }
+      optional_fields->Set(message_center::kItemsKey, items);
+    }
+
+    NotificationsApiDelegate* api_delegate(new NotificationsApiDelegate(
+        this,
+        profile(),
+        extension_->id(),
+        id));  // ownership is passed to Notification
+    Notification notification(type, extension_->url(), icon_url, title, message,
+                              WebKit::WebTextDirectionDefault,
+                              UTF8ToUTF16(extension_->name()),
+                              UTF8ToUTF16(api_delegate->id()),
+                              optional_fields.get(), api_delegate);
+
+    g_browser_process->notification_ui_manager()->Add(notification, profile());
+  }
 }
-#else  // defined(ENABLE_MESSAGE_CENTER)
-void NotificationsApiFunction::CreateNotification(
-    const std::string& id,
-    api::notifications::NotificationOptions* options) {
-  message_center::NotificationType type =
-      MapApiTemplateTypeToType(options->type);
-  GURL icon_url(UTF8ToUTF16(options->icon_url));
-  string16 title(UTF8ToUTF16(options->title));
-  string16 message(UTF8ToUTF16(options->message));
-
-  scoped_ptr<DictionaryValue> optional_fields(new DictionaryValue());
-
-  // For all notification types.
-  if (options->priority.get())
-    optional_fields->SetInteger(message_center::kPriorityKey,
-                                *options->priority);
-  if (options->event_time.get())
-    optional_fields->SetDouble(message_center::kTimestampKey,
-                               *options->event_time);
-  if (options->buttons.get()) {
-    if (options->buttons->size() > 0) {
-      linked_ptr<api::notifications::NotificationButton> button =
-          (*options->buttons)[0];
-      optional_fields->SetString(message_center::kButtonOneTitleKey,
-                                 UTF8ToUTF16(button->title));
-      if (button->icon_url.get())
-        optional_fields->SetString(message_center::kButtonOneIconUrlKey,
-                                   UTF8ToUTF16(*button->icon_url));
-    }
-    if (options->buttons->size() > 1) {
-      linked_ptr<api::notifications::NotificationButton> button =
-          (*options->buttons)[1];
-      optional_fields->SetString(message_center::kButtonTwoTitleKey,
-                                 UTF8ToUTF16(button->title));
-      if (button->icon_url.get())
-        optional_fields->SetString(message_center::kButtonTwoIconUrlKey,
-                                   UTF8ToUTF16(*button->icon_url));
-    }
-  }
-  if (options->expanded_message.get())
-    optional_fields->SetString(message_center::kExpandedMessageKey,
-                               UTF8ToUTF16(*options->expanded_message));
-
-  // For image notifications (type == 'image').
-  // TODO(dharcourt): Fail if (type == 'image' && !options->image_url.get())
-  // TODO(dharcourt): Fail if (type != 'image' && options->image_url.get())
-  if (options->image_url.get())
-    optional_fields->SetString(message_center::kImageUrlKey,
-                               UTF8ToUTF16(*options->image_url));
-
-  // For list notifications (type == 'multiple').
-  // TODO(dharcourt): Fail if (type == 'multiple' && !options->items.get())
-  // TODO(dharcourt): Fail if (type != 'multiple' && options->items.get())
-  if (options->items.get()) {
-    base::ListValue* items = new base::ListValue();
-    std::vector<
-      linked_ptr<
-        api::notifications::NotificationItem> >::iterator i;
-    for (i = options->items->begin(); i != options->items->end(); ++i) {
-      base::DictionaryValue* item = new base::DictionaryValue();
-      item->SetString(message_center::kItemTitleKey,
-                      UTF8ToUTF16(i->get()->title));
-      item->SetString(message_center::kItemMessageKey,
-                      UTF8ToUTF16(i->get()->message));
-      items->Append(item);
-    }
-    optional_fields->Set(message_center::kItemsKey, items);
-  }
-
-  NotificationsApiDelegate* api_delegate(new NotificationsApiDelegate(
-      this,
-      profile(),
-      extension_->id(),
-      id));  // ownership is passed to Notification
-  Notification notification(type, extension_->url(), icon_url, title, message,
-                            WebKit::WebTextDirectionDefault,
-                            UTF8ToUTF16(extension_->name()),
-                            UTF8ToUTF16(api_delegate->id()),
-                            optional_fields.get(), api_delegate);
-
-  g_browser_process->notification_ui_manager()->Add(notification, profile());
-}
-#endif  // !defined(ENABLE_MESSAGE_CENTER)
 
 bool NotificationsApiFunction::IsNotificationsApiEnabled() {
   DesktopNotificationService* service =
       DesktopNotificationServiceFactory::GetForProfile(profile());
   return service->IsExtensionEnabled(extension_->id());
 }
 
 bool NotificationsApiFunction::RunImpl() {
   if (IsNotificationsApiAvailable() && IsNotificationsApiEnabled()) {
     return RunNotificationsApi();
@@ skipping 96 matching lines @@
       CancelById(NotificationsApiDelegate::CreateScopedIdentifier(
           extension_->id(), params_->notification_id));
 
   SetResult(Value::CreateBooleanValue(cancel_result));
   SendResponse(true);
 
   return true;
 }
 
 }  // namespace extensions