Revert "Rename experimental.accessibility to accessibilityPrivate"

chrome/browser/accessibility/accessibility_extension_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/accessibility/accessibility_extension_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/api/accessibility_private.h"
+#include "chrome/common/extensions/api/experimental_accessibility.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/lazy_background_task_queue.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 
 namespace keys = extension_accessibility_api_constants;
-namespace accessibility_private =
-    extensions::api::accessibility_private;
+namespace experimental_accessibility =
+    extensions::api::experimental_accessibility;
 
 // 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.
 scoped_ptr<base::ListValue> ControlInfoToEventArguments(
     const AccessibilityEventInfo* info) {
   base::DictionaryValue* dict = new base::DictionaryValue();
   info->SerializeToDict(dict);
 
   scoped_ptr<base::ListValue> args(new base::ListValue());
@@ skipping 82 matching lines @@
       break;
     default:
       NOTREACHED();
   }
 }
 
 void ExtensionAccessibilityEventRouter::OnWindowOpened(
     const AccessibilityWindowInfo* info) {
   scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
   DispatchEvent(info->profile(),
-                accessibility_private::OnWindowOpened::kEventName,
+                experimental_accessibility::OnWindowOpened::kEventName,
                 args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnControlFocused(
     const AccessibilityControlInfo* info) {
   last_focused_control_dict_.Clear();
   info->SerializeToDict(&last_focused_control_dict_);
   scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
   DispatchEvent(info->profile(),
-                accessibility_private::OnControlFocused::kEventName,
+                experimental_accessibility::OnControlFocused::kEventName,
                 args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnControlAction(
     const AccessibilityControlInfo* info) {
   scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
   DispatchEvent(info->profile(),
-                accessibility_private::OnControlAction::kEventName,
+                experimental_accessibility::OnControlAction::kEventName,
                 args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnTextChanged(
     const AccessibilityControlInfo* info) {
   scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
   DispatchEvent(info->profile(),
-                accessibility_private::OnTextChanged::kEventName,
+                experimental_accessibility::OnTextChanged::kEventName,
                 args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnMenuOpened(
     const AccessibilityMenuInfo* info) {
   scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
   DispatchEvent(info->profile(),
-                accessibility_private::OnMenuOpened::kEventName,
+                experimental_accessibility::OnMenuOpened::kEventName,
                 args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnMenuClosed(
     const AccessibilityMenuInfo* info) {
   scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
   DispatchEvent(info->profile(),
-                accessibility_private::OnMenuClosed::kEventName,
+                experimental_accessibility::OnMenuClosed::kEventName,
                 args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnChromeVoxLoadStateChanged(
     Profile* profile,
     bool loading,
     bool make_announcements) {
   scoped_ptr<base::ListValue> event_args(new base::ListValue());
   event_args->Append(base::Value::CreateBooleanValue(loading));
   event_args->Append(base::Value::CreateBooleanValue(make_announcements));
   ExtensionAccessibilityEventRouter::DispatchEventToChromeVox(profile,
-      accessibility_private::OnChromeVoxLoadStateChanged::kEventName,
+      experimental_accessibility::OnChromeVoxLoadStateChanged::kEventName,
       event_args.Pass());
 }
 
 // Static.
 void ExtensionAccessibilityEventRouter::DispatchEventToChromeVox(
     Profile* profile,
     const char* event_name,
     scoped_ptr<base::ListValue> event_args) {
   extensions::ExtensionSystem* system =
       extensions::ExtensionSystem::Get(profile);
@@ skipping 13 matching lines @@
     return;
   extensions::EventRouter* event_router = extensions::EventRouter::Get(profile);
   if (!event_router)
     return;
 
   scoped_ptr<extensions::Event> event(new extensions::Event(
       event_name, event_args.Pass()));
   event_router->BroadcastEvent(event.Pass());
 }
 
-bool AccessibilityPrivateSetAccessibilityEnabledFunction::RunImpl() {
+bool AccessibilitySetAccessibilityEnabledFunction::RunImpl() {
   bool enabled;
   EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(0, &enabled));
   ExtensionAccessibilityEventRouter::GetInstance()
       ->SetAccessibilityEnabled(enabled);
   return true;
 }
 
-bool AccessibilityPrivateSetNativeAccessibilityEnabledFunction::RunImpl() {
+bool AccessibilitySetNativeAccessibilityEnabledFunction::RunImpl() {
   bool enabled;
   EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(0, &enabled));
   if (enabled) {
     content::BrowserAccessibilityState::GetInstance()->
         EnableAccessibility();
   } else {
     content::BrowserAccessibilityState::GetInstance()->
         DisableAccessibility();
   }
   return true;
 }
 
-bool AccessibilityPrivateGetFocusedControlFunction::RunImpl() {
+bool AccessibilityGetFocusedControlFunction::RunImpl() {
   // Get the serialized dict from the last focused control and return it.
   // However, if the dict is empty, that means we haven't seen any focus
   // events yet, so return null instead.
   ExtensionAccessibilityEventRouter *accessibility_event_router =
       ExtensionAccessibilityEventRouter::GetInstance();
   base::DictionaryValue *last_focused_control_dict =
       accessibility_event_router->last_focused_control_dict();
   if (last_focused_control_dict->size()) {
     SetResult(last_focused_control_dict->DeepCopyWithoutEmptyChildren());
   } else {
     SetResult(base::Value::CreateNullValue());
   }
   return true;
 }
 
-bool AccessibilityPrivateGetAlertsForTabFunction::RunImpl() {
+bool AccessibilityGetAlertsForTabFunction::RunImpl() {
   int tab_id;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &tab_id));
 
   TabStripModel* tab_strip = NULL;
   content::WebContents* contents = NULL;
   int tab_index = -1;
   if (!extensions::ExtensionTabUtil::GetTabById(tab_id,
                                                 GetProfile(),
                                                 include_incognito(),
                                                 NULL,
@@ skipping 18 matching lines @@
       const base::string16 message_text =
           confirm_infobar_delegate->GetMessageText();
       alert_value->SetString(keys::kMessageKey, message_text);
       alerts_value->Append(alert_value);
     }
   }
 
   SetResult(alerts_value);
   return true;
 }