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

chrome/browser/chromeos/login/wizard_accessibility_handler.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/chromeos/login/wizard_accessibility_handler.h"
 
 #include <algorithm>
 
 #include "base/i18n/char_iterator.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/accessibility_events.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/speech_synthesis_library.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/extensions/extension_accessibility_api_constants.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace keys = extension_accessibility_api_constants;
 
 namespace {
 
 static std::string SubstringUTF8(std::string str, int start, int len) {
@@ skipping 64 matching lines @@
   AppendUtterance(l10n_util::GetStringFUTF8(IDS_CHROMEOS_ACC_INDEX_OF_COUNT,
                                             index_str,
                                             count_str), str);
 }
 
 }  // anonymous namespace
 
 namespace chromeos {
 
 void WizardAccessibilityHandler::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   const AccessibilityControlInfo *control_info =
       Details<const AccessibilityControlInfo>(details).ptr();
   std::string description;
   EarconType earcon = NO_EARCON;
   DescribeAccessibilityEvent(type, control_info, &description, &earcon);
   Speak(description.c_str(), false, true);
 }
 
 void WizardAccessibilityHandler::Speak(const char* speak_str,
                                        bool queue,
                                        bool interruptible) {
   if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
     if (queue || !interruptible) {
       std::string props = "";
       props.append("enqueue=");
       props.append(queue ? "1;" : "0;");
       props.append("interruptible=");
       props.append(interruptible ? "1;" : "0;");
       chromeos::CrosLibrary::Get()->GetSpeechSynthesisLibrary()->
           SetSpeakProperties(props.c_str());
     }
     chromeos::CrosLibrary::Get()->GetSpeechSynthesisLibrary()->
         Speak(speak_str);
   }
 }
 
 void WizardAccessibilityHandler::DescribeAccessibilityEvent(
-    NotificationType event_type,
+    int event_type,
     const AccessibilityControlInfo* control_info,
     std::string* out_spoken_description,
     EarconType* out_earcon) {
   *out_spoken_description = std::string();
   *out_earcon = NO_EARCON;
 
-  switch (event_type.value) {
-    case NotificationType::ACCESSIBILITY_CONTROL_FOCUSED:
+  switch (event_type) {
+    case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED:
       DescribeControl(control_info, false, out_spoken_description, out_earcon);
       break;
-    case NotificationType::ACCESSIBILITY_CONTROL_ACTION:
+    case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION:
       DescribeControl(control_info, true, out_spoken_description, out_earcon);
       break;
-    case NotificationType::ACCESSIBILITY_TEXT_CHANGED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED:
       DescribeTextChanged(control_info, out_spoken_description, out_earcon);
       break;
-    case NotificationType::ACCESSIBILITY_MENU_OPENED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED:
       *out_earcon = EARCON_OBJECT_OPENED;
       break;
-    case NotificationType::ACCESSIBILITY_MENU_CLOSED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED:
       *out_earcon = EARCON_OBJECT_CLOSED;
       break;
     default:
       NOTREACHED();
       return;
   }
 
   if (control_info->type() == keys::kTypeTextBox) {
     const AccessibilityTextBoxInfo* text_box =
         static_cast<const AccessibilityTextBoxInfo*>(control_info);
@@ skipping 272 matching lines @@
   } else if (!inserted.empty()) {
     // Speak inserted text.
     AppendUtterance(inserted, out_spoken_description);
   } else if (!deleted.empty()) {
     // Speak deleted text.
     AppendUtterance(deleted, out_spoken_description);
   }
 }
 
 }  // namespace chromeos