Adjust ChromeVox (spoken feedback) strings and make it possible for announcemen

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/event_router.h"
+#include "chrome/browser/extensions/extension_host.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
+#include "chrome/browser/extensions/lazy_background_task_queue.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/experimental_accessibility.h"
+#include "chrome/common/extensions/background_info.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "extensions/common/error_utils.h"
 
 namespace keys = extension_accessibility_api_constants;
 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.
@@ skipping 127 matching lines @@
 }
 
 void ExtensionAccessibilityEventRouter::OnMenuClosed(
     const AccessibilityMenuInfo* info) {
   scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
   DispatchEvent(info->profile(),
                 experimental_accessibility::OnMenuClosed::kEventName,
                 args.Pass());
 }
 
+void ExtensionAccessibilityEventRouter::
+    OnSpokenFeedbackEnabled(Profile* profile, bool make_announcements) {
+  scoped_ptr<base::ListValue> event_args(new base::ListValue());
+  event_args->Append(base::Value::CreateBooleanValue(make_announcements));
+  ExtensionAccessibilityEventRouter::DispatchEventToChromeVox(profile,
+      experimental_accessibility::OnSpokenFeedbackEnabled::kEventName,
+      event_args.Pass(),
+      true,
+      NULL);
+}
+
+void ExtensionAccessibilityEventRouter::
+    OnSpokenFeedbackDisabled(Profile* profile) {
+  scoped_ptr<base::ListValue> event_args(new base::ListValue());
+  ExtensionAccessibilityEventRouter::DispatchEventToChromeVox(profile,
+      experimental_accessibility::OnSpokenFeedbackDisabled::kEventName,
+      event_args.Pass(),
+      true,
+      NULL);
+}
+
+// Static.
+void ExtensionAccessibilityEventRouter::DispatchEventToChromeVox(
+    Profile* profile,
+    const char* event_name,
+    scoped_ptr<base::ListValue> event_args,
+    bool first_call,
+    extensions::ExtensionHost* host) {
+  if (!first_call && !host)
+    return;
+
+  extensions::ExtensionSystem* system =
+      extensions::ExtensionSystem::Get(profile);
+  if (!system)
+    return;
+
+  const char* extension_id = extension_misc::kChromeVoxExtensionId;
+  // If this is a persistent background page, we want to wait for it to load
+  // (it might not be ready, since this is startup). But only enqueue once.
+  // If it fails to load the first time, don't bother trying again.
+  const extensions::Extension* extension =
+      system->extension_service()->extensions()->GetByID(extension_id);
+  if (extension &&
+      extensions::BackgroundInfo::HasPersistentBackgroundPage(extension) &&
+      first_call &&
+      system->lazy_background_task_queue()->
+          ShouldEnqueueTask(profile, extension)) {
+    extensions::LazyBackgroundTaskQueue* queue =

[dmazzoni, 2013/10/29 19:08:44]

Move this to before the "if" because the conditional clause also references
system->lazy_background_task_queue().

Also, a few using declarations at the top of the file would make this more
concise. How about:

using extensions::LazyBackgroundTaskQueue
using extensions::BackgroundInfo

+        system->lazy_background_task_queue();
+    const extensions::LazyBackgroundTaskQueue::PendingTask callback =
+        base::Bind(&DispatchEventToChromeVox,
+                   profile,
+                   event_name,
+                   base::Passed(&event_args),
+                   false);
+    queue->AddPendingTask(profile, extension_id, callback);
+    return;
+  }
+
+  scoped_ptr<extensions::Event> event(new extensions::Event(event_name,
+                                                            event_args.Pass()));
+  system->event_router()->DispatchEventToExtension(
+      extension_id, event.Pass());
+}
+
 void ExtensionAccessibilityEventRouter::DispatchEvent(
     Profile* profile,
     const char* event_name,
     scoped_ptr<base::ListValue> event_args) {
   if (enabled_ && profile &&
       extensions::ExtensionSystem::Get(profile)->event_router()) {
     scoped_ptr<extensions::Event> event(new extensions::Event(
         event_name, event_args.Pass()));
     extensions::ExtensionSystem::Get(profile)->event_router()->
         BroadcastEvent(event.Pass());
@@ skipping 63 matching lines @@
       DictionaryValue* alert_value = new DictionaryValue;
       const string16 message_text = confirm_infobar_delegate->GetMessageText();
       alert_value->SetString(keys::kMessageKey, message_text);
       alerts_value->Append(alert_value);
     }
   }
 
   SetResult(alerts_value);
   return true;
 }