Take notification API out of experimental.

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/notification/notification_api.h"
+#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 "googleurl/src/gurl.h"
 
 namespace extensions {
 
 namespace {
 
 const char kResultKey[] = "result";
 
-class NotificationApiDelegate : public NotificationDelegate {
+class NotificationsApiDelegate : public NotificationDelegate {
  public:
-  NotificationApiDelegate(ApiFunction* api_function,
+  NotificationsApiDelegate(ApiFunction* api_function,
                           Profile* profile,
                           const std::string& extension_id,
                           const std::string& id)
       : api_function_(api_function),
         profile_(profile),
         extension_id_(extension_id),
         id_(id),
         scoped_id_(CreateScopedIdentifier(extension_id, id)) {
     DCHECK(api_function_);
   }
@@ skipping 38 matching lines @@
 
   virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE {
     // We're holding a reference to api_function_, so we know it'll be valid as
     // long as we are, and api_function_ (as a UIThreadExtensionFunction)
     // listens to content::NOTIFICATION_RENDER_VIEW_HOST_DELETED and will
     // properly zero out its copy of render_view_host when the RVH goes away.
     return api_function_->render_view_host();
   }
 
  private:
-  virtual ~NotificationApiDelegate() {}
+  virtual ~NotificationsApiDelegate() {}
 
   void SendEvent(const std::string& name, scoped_ptr<ListValue> args) {
     scoped_ptr<Event> event(new Event(name, args.Pass()));
     ExtensionSystem::Get(profile_)->event_router()->DispatchEventToExtension(
         extension_id_, event.Pass());
   }
 
   scoped_ptr<ListValue> CreateBaseEventArgs() {
     scoped_ptr<ListValue> args(new ListValue());
     args->Append(Value::CreateStringValue(id_));
     return args.Pass();
   }
 
   scoped_refptr<ApiFunction> api_function_;
   Profile* profile_;
   const std::string extension_id_;
   const std::string id_;
   const std::string scoped_id_;
 
-  DISALLOW_COPY_AND_ASSIGN(NotificationApiDelegate);
+  DISALLOW_COPY_AND_ASSIGN(NotificationsApiDelegate);
 };
 
 }  // namespace
 
-NotificationApiFunction::NotificationApiFunction() {
+NotificationsApiFunction::NotificationsApiFunction() {
 }
 
-NotificationApiFunction::~NotificationApiFunction() {
+NotificationsApiFunction::~NotificationsApiFunction() {
 }
 
 message_center::NotificationType
-NotificationApiFunction::MapApiTemplateTypeToType(
-    api::experimental_notification::TemplateType type) {
+NotificationsApiFunction::MapApiTemplateTypeToType(

[dharcourt, 2013/03/04 23:46:27]

Nit: To match declaration order, the definition of IsNotificationsApiAvailable()
should be further down and the definition of IsNotificationsApiAvailable() 
should be before CreateNotification(). To make it closer to
IsNotificationsApiAvailable(), both the declaration and definition of
IsNotificationsApiEnabled() should be moved up to be just before
CreateNotification().

+    api::notifications::TemplateType type) {
   switch (type) {
-    case api::experimental_notification::TEMPLATE_TYPE_NONE:
-    case api::experimental_notification::TEMPLATE_TYPE_SIMPLE:
+    case api::notifications::TEMPLATE_TYPE_NONE:
+    case api::notifications::TEMPLATE_TYPE_SIMPLE:
       return message_center::NOTIFICATION_TYPE_SIMPLE;
-    case api::experimental_notification::TEMPLATE_TYPE_BASIC:
+    case api::notifications::TEMPLATE_TYPE_BASIC:
       return message_center::NOTIFICATION_TYPE_BASE_FORMAT;
-    case api::experimental_notification::TEMPLATE_TYPE_IMAGE:
+    case api::notifications::TEMPLATE_TYPE_IMAGE:
       return message_center::NOTIFICATION_TYPE_IMAGE;
-    case api::experimental_notification::TEMPLATE_TYPE_LIST:
+    case api::notifications::TEMPLATE_TYPE_LIST:
       return message_center::NOTIFICATION_TYPE_MULTIPLE;
     default:
       // Gracefully handle newer application code that is running on an older
       // runtime that doesn't recognize the requested template.
       return message_center::NOTIFICATION_TYPE_BASE_FORMAT;
   }
 }
 
 // If older notification runtime is used, MessageCenter is not built.
 // Use simpler bridge then, ignoring all options.
 #if !defined (ENABLE_MESSAGE_CENTER)
-void NotificationApiFunction::CreateNotification(
+void NotificationsApiFunction::CreateNotification(
     const std::string& id,
-    api::experimental_notification::NotificationOptions* options) {
+    api::notifications::NotificationOptions* options) {
   message_center::NotificationType type =
       MapApiTemplateTypeToType(options->template_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());
 
-  NotificationApiDelegate* api_delegate(new NotificationApiDelegate(
+  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,
                             string16(), UTF8ToUTF16(api_delegate->id()),
                             optional_fields.get(), api_delegate);
 
   g_browser_process->notification_ui_manager()->Add(notification, profile());
 }
 #else  // defined(ENABLE_MESSAGE_CENTER)
-void NotificationApiFunction::CreateNotification(
+void NotificationsApiFunction::CreateNotification(
     const std::string& id,
-    api::experimental_notification::NotificationOptions* options) {
+    api::notifications::NotificationOptions* options) {
   message_center::NotificationType type =
       MapApiTemplateTypeToType(options->template_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::experimental_notification::NotificationButton> button =
+      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::experimental_notification::NotificationButton> button =
+      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::experimental_notification::NotificationItem> >::iterator i;
+        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);
   }
 
-  NotificationApiDelegate* api_delegate(new NotificationApiDelegate(
+  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,
                             string16(), UTF8ToUTF16(api_delegate->id()),
                             optional_fields.get(), api_delegate);
 
   g_browser_process->notification_ui_manager()->Add(notification, profile());
 }
 #endif  // !defined(ENABLE_MESSAGE_CENTER)
 
-bool NotificationApiFunction::IsNotificationApiEnabled() {
+bool NotificationsApiFunction::IsNotificationsApiEnabled() {
   DesktopNotificationService* service =
       DesktopNotificationServiceFactory::GetForProfile(profile());
   return service->IsExtensionEnabled(extension_->id());
 }
 
-bool NotificationApiFunction::RunImpl() {
-  if (!IsNotificationApiEnabled()) {
+bool NotificationsApiFunction::IsNotificationsApiAvailable() {
+  // TODO(miket): remove/change this check when we leave dev.
+  if (chrome::VersionInfo::CHANNEL_DEV < Feature::GetCurrentChannel())
+    return false;
+
+  // We need to check this explicitly rather than letting
+  // _permission_features.json enforce it, because we're sharing the
+  // chrome.notifications permissions namespace with WebKit notifications.
+  if (!(GetExtension()->is_platform_app() || GetExtension()->is_extension()))
+    return false;
+
+  return true;
+}
+
+bool NotificationsApiFunction::RunImpl() {
+  if (IsNotificationsApiAvailable() && IsNotificationsApiEnabled()) {
+    return RunNotificationsApi();
+  } else {
     SendResponse(false);
     return true;
   }
-
-  return RunNotificationApi();
 }
 
-const char kNotificationPrefix[] = "extension.api.";
+const char kNotificationPrefix[] = "extensions.api.";
 
 static uint64 next_id_ = 0;
 
-NotificationCreateFunction::NotificationCreateFunction() {
+NotificationsCreateFunction::NotificationsCreateFunction() {
 }
 
-NotificationCreateFunction::~NotificationCreateFunction() {
+NotificationsCreateFunction::~NotificationsCreateFunction() {
 }
 
-bool NotificationCreateFunction::RunNotificationApi() {
-  params_ = api::experimental_notification::Create::Params::Create(*args_);
+bool NotificationsCreateFunction::RunNotificationsApi() {
+  params_ = api::notifications::Create::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
 
   // If the caller provided a notificationId, use that. Otherwise, generate
   // one. Note that there's nothing stopping an app developer from passing in
   // arbitrary "extension.api.999" notificationIds that will collide with
   // future generated IDs. It doesn't seem necessary to try to prevent this; if
   // developers want to hurt themselves, we'll let them.
   const std::string extension_id(extension_->id());
   std::string notification_id;
   if (!params_->notification_id.empty())
     notification_id = params_->notification_id;
   else
     notification_id = kNotificationPrefix + base::Uint64ToString(next_id_++);
 
   CreateNotification(notification_id, &params_->options);
 
   SetResult(Value::CreateStringValue(notification_id));
 
   SendResponse(true);
 
   return true;
 }
 
-NotificationUpdateFunction::NotificationUpdateFunction() {
+NotificationsUpdateFunction::NotificationsUpdateFunction() {
 }
 
-NotificationUpdateFunction::~NotificationUpdateFunction() {
+NotificationsUpdateFunction::~NotificationsUpdateFunction() {
 }
 
-bool NotificationUpdateFunction::RunNotificationApi() {
-  params_ = api::experimental_notification::Update::Params::Create(*args_);
+bool NotificationsUpdateFunction::RunNotificationsApi() {
+  params_ = api::notifications::Update::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
 
   if (g_browser_process->notification_ui_manager()->
-      DoesIdExist(NotificationApiDelegate::CreateScopedIdentifier(
+      DoesIdExist(NotificationsApiDelegate::CreateScopedIdentifier(
           extension_->id(), params_->notification_id))) {
     CreateNotification(params_->notification_id, &params_->options);
     SetResult(Value::CreateBooleanValue(true));
   } else {
     SetResult(Value::CreateBooleanValue(false));
   }
 
   SendResponse(true);
 
   return true;
 }
 
-NotificationClearFunction::NotificationClearFunction() {
+NotificationsClearFunction::NotificationsClearFunction() {
 }
 
-NotificationClearFunction::~NotificationClearFunction() {
+NotificationsClearFunction::~NotificationsClearFunction() {
 }
 
-bool NotificationClearFunction::RunNotificationApi() {
-  params_ = api::experimental_notification::Clear::Params::Create(*args_);
+bool NotificationsClearFunction::RunNotificationsApi() {
+  params_ = api::notifications::Clear::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
 
   bool cancel_result = g_browser_process->notification_ui_manager()->
-      CancelById(NotificationApiDelegate::CreateScopedIdentifier(
+      CancelById(NotificationsApiDelegate::CreateScopedIdentifier(
           extension_->id(), params_->notification_id));
 
   SetResult(Value::CreateBooleanValue(cancel_result));
   SendResponse(true);
 
   return true;
 }
 
 }  // namespace extensions