Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/extensions/extension_accessibility_api.cc

 // Copyright (c) 2011 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/extension_tabs_module.h"
 
 #include "base/json/json_writer.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/extensions/extension_accessibility_api_constants.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/common/notification_service.h"
 
 namespace keys = extension_accessibility_api_constants;
 
 // Returns the AccessibilityControlInfo serialized into a JSON string,
 // consisting of an array of a single object of type AccessibilityObject,
 // as defined in the accessibility extension api's json schema.
 std::string ControlInfoToJsonString(const AccessibilityControlInfo* info) {
   ListValue args;
@@ skipping 16 matching lines @@
 ExtensionAccessibilityEventRouter::~ExtensionAccessibilityEventRouter() {
   STLDeleteElements(&on_enabled_listeners_);
   STLDeleteElements(&on_disabled_listeners_);
 }
 
 void ExtensionAccessibilityEventRouter::ObserveProfile(Profile* profile) {
   last_focused_control_dict_.Clear();
 
   if (registrar_.IsEmpty()) {
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_WINDOW_OPENED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_WINDOW_CLOSED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_CONTROL_FOCUSED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_CONTROL_ACTION,
+                   chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_TEXT_CHANGED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_MENU_OPENED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_MENU_CLOSED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED,
                    NotificationService::AllSources());
   }
 }
 
 void ExtensionAccessibilityEventRouter::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::ACCESSIBILITY_WINDOW_OPENED:
+  switch (type) {
+    case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED:
       OnWindowOpened(Details<const AccessibilityWindowInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_WINDOW_CLOSED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED:
       OnWindowClosed(Details<const AccessibilityWindowInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_CONTROL_FOCUSED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED:
       OnControlFocused(Details<const AccessibilityControlInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_CONTROL_ACTION:
+    case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION:
       OnControlAction(Details<const AccessibilityControlInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_TEXT_CHANGED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED:
       OnTextChanged(Details<const AccessibilityControlInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_MENU_OPENED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED:
       OnMenuOpened(Details<const AccessibilityMenuInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_MENU_CLOSED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED:
       OnMenuClosed(Details<const AccessibilityMenuInfo>(details).ptr());
       break;
     default:
       NOTREACHED();
   }
 }
 
 void ExtensionAccessibilityEventRouter::SetAccessibilityEnabled(bool enabled) {
   if (enabled_ != enabled) {
     enabled_ = enabled;
@@ skipping 93 matching lines @@
       ExtensionAccessibilityEventRouter::GetInstance();
   DictionaryValue *last_focused_control_dict =
       accessibility_event_router->last_focused_control_dict();
   if (last_focused_control_dict->size()) {
     result_.reset(last_focused_control_dict->DeepCopyWithoutEmptyChildren());
   } else {
     result_.reset(Value::CreateNullValue());
   }
   return true;
 }