Adds extension events for custom dictionary load/change.

chrome/browser/chromeos/extensions/input_method_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/chromeos/extensions/input_method_api.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/extensions/dictionary_event_router.h"
 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chromeos/chromeos_switches.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "ui/base/ime/chromeos/extension_ime_util.h"
 #include "ui/base/ime/chromeos/input_method_descriptor.h"
@@ skipping 129 matching lines @@
   // - Already in the dictionary.
   // - Not a UTF8 string.
   // - Longer than 99 bytes (MAX_CUSTOM_DICTIONARY_WORD_BYTES).
   // - Leading/trailing whitespace.
   // - Empty.
   return RespondNow(Error("Unable to add invalid word to dictionary."));
 #endif
 }
 
 // static
+const char InputMethodAPI::kOnDictionaryChanged[] =
+    "inputMethodPrivate.onDictionaryChanged";
+
+// static
+const char InputMethodAPI::kOnDictionaryLoaded[] =
+    "inputMethodPrivate.onDictionaryLoaded";
+
+// static
 const char InputMethodAPI::kOnInputMethodChanged[] =
     "inputMethodPrivate.onChanged";
 
 InputMethodAPI::InputMethodAPI(content::BrowserContext* context)
     : context_(context) {
   EventRouter::Get(context_)->RegisterObserver(this, kOnInputMethodChanged);
+  EventRouter::Get(context_)->RegisterObserver(this, kOnDictionaryChanged);
+  EventRouter::Get(context_)->RegisterObserver(this, kOnDictionaryLoaded);
   ExtensionFunctionRegistry* registry =
       ExtensionFunctionRegistry::GetInstance();
   registry->RegisterFunction<GetInputMethodConfigFunction>();
   registry->RegisterFunction<GetCurrentInputMethodFunction>();
   registry->RegisterFunction<SetCurrentInputMethodFunction>();
   registry->RegisterFunction<GetInputMethodsFunction>();
   registry->RegisterFunction<FetchAllDictionaryWordsFunction>();
   registry->RegisterFunction<AddWordToDictionaryFunction>();
 }
 
 InputMethodAPI::~InputMethodAPI() {
 }
 
 // static
 std::string InputMethodAPI::GetInputMethodForXkb(const std::string& xkb_id) {
   std::string xkb_prefix =
       chromeos::extension_ime_util::GetInputMethodIDByEngineID(kXkbPrefix);
   size_t prefix_length = xkb_prefix.length();
   DCHECK(xkb_id.substr(0, prefix_length) == xkb_prefix);
   return xkb_id.substr(prefix_length);
 }
 
 void InputMethodAPI::Shutdown() {
-  // UnregisterObserver may have already been called in OnListenerAdded,
-  // but it is safe to call it more than once.
   EventRouter::Get(context_)->UnregisterObserver(this);
 }
 
 void InputMethodAPI::OnListenerAdded(
     const extensions::EventListenerInfo& details) {
-  DCHECK(!input_method_event_router_.get());
-  input_method_event_router_.reset(
-      new chromeos::ExtensionInputMethodEventRouter(context_));
-  EventRouter::Get(context_)->UnregisterObserver(this);
+  if (details.event_name == kOnInputMethodChanged) {
+    if (!input_method_event_router_.get()) {
+      input_method_event_router_.reset(
+          new chromeos::ExtensionInputMethodEventRouter(context_));
+    }
+  } else if (details.event_name == kOnDictionaryChanged ||
+             details.event_name == kOnDictionaryLoaded) {
+    if (!dictionary_event_router_.get()) {
+      dictionary_event_router_.reset(
+          new chromeos::ExtensionDictionaryEventRouter(context_));
+    }
+    if (details.event_name == kOnDictionaryLoaded) {
+      dictionary_event_router_->DispatchLoadedEventIfLoaded();
+    }
+  }
 }
 
 static base::LazyInstance<BrowserContextKeyedAPIFactory<InputMethodAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<InputMethodAPI>*
 InputMethodAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 }  // namespace extensions