Move all white-listed input method indicator text from InputMethodUtil to manifests of IME extensio…

chromeos/ime/input_method_descriptor.cc

 // Copyright 2013 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 "chromeos/ime/input_method_descriptor.h"
 
 #include <sstream>
 
 #include "base/logging.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "chromeos/ime/extension_ime_util.h"
 #include "url/gurl.h"
 
 namespace chromeos {
 namespace input_method {
 
 InputMethodDescriptor::InputMethodDescriptor(
     const std::string& id,
     const std::string& name,
     const std::string& indicator,
     const std::vector<std::string>& keyboard_layouts,
@@ skipping 10 matching lines @@
       options_page_url_(options_page_url),
       input_view_url_(input_view_url) {
 }
 
 std::string InputMethodDescriptor::GetPreferredKeyboardLayout() const {
   // TODO(nona): Investigate better way to guess the preferred layout
   //             http://crbug.com/170601.
   return keyboard_layouts_.empty() ? "us" : keyboard_layouts_[0];
 }
 
+std::string InputMethodDescriptor::GetIndicator() const {
+  // If indicator is empty, use the first two character in its preferred
+  // keyboard layout or language code.
+  if (indicator_.empty()) {
+    if (extension_ime_util::IsKeyboardLayoutExtension(id_))
+      return StringToUpperASCII(GetPreferredKeyboardLayout().substr(0, 2));
+    DCHECK(language_codes_.size() > 0);
+    return StringToUpperASCII(language_codes_[0].substr(0, 2));
+  }
+  return indicator_;

[Seigo Nonaka, 2014/09/30 02:49:01]

This |indicator_| can be set by third party, right?

If so, I think the UI is not good if the indicator is too long or contains line
breaking characters.
I think no need to do in this CL but probably it is good to restrict to several
length (e.g. 4) and good to remove some control characters.

[Shu Chen, 2014/09/30 02:52:56]

This cl only enables the indicator for component IME extensions.
I will follow up on how it can be supported for 3rd party IME extensions in the
future.
Thanks!

+}
+
 InputMethodDescriptor::InputMethodDescriptor() {
 }
 
 InputMethodDescriptor::~InputMethodDescriptor() {
 }
 
 }  // namespace input_method
 }  // namespace chromeos