Add member variables to VirtualKeyboardSelector

chrome/browser/chromeos/input_method/virtual_keyboard_selector.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/input_method/virtual_keyboard_selector.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 
 namespace {
@@ skipping 16 matching lines @@
   }
   return NULL;
 }
 
 }  // namespace
 
 namespace chromeos {
 namespace input_method {
 
 VirtualKeyboard::VirtualKeyboard(const GURL& url,
+                                 const std::string& name,
                                  const std::set<std::string>& supported_layouts,
                                  bool is_system)
     : url_(url),
+      name_(name),
       supported_layouts_(supported_layouts),
       is_system_(is_system) {
 }
 
 VirtualKeyboard::~VirtualKeyboard() {
 }
 
 GURL VirtualKeyboard::GetURLForLayout(const std::string& layout) const {
   if (layout.empty()) {
     return url_;
@@ skipping 14 matching lines @@
     : current_(NULL) {
 }
 
 VirtualKeyboardSelector::~VirtualKeyboardSelector() {
   STLDeleteElements(&keyboards_);
   STLDeleteElements(&system_keyboards_);
 }
 
 bool VirtualKeyboardSelector::AddVirtualKeyboard(
     const GURL& url,
+    const std::string& name,
     const std::set<std::string>& supported_layouts,
     bool is_system) {
   if (url_to_keyboard_.count(url))
     return false;  // the URL is already in use.
 
   const VirtualKeyboard* new_keyboard = new VirtualKeyboard(url,
+                                                            name,
                                                             supported_layouts,
                                                             is_system);
   if (is_system) {
     system_keyboards_.push_front(new_keyboard);
   } else {
     keyboards_.push_front(new_keyboard);
   }
 
   url_to_keyboard_.insert(std::make_pair(url, new_keyboard));
+  std::set<std::string>::const_iterator layout_iter;
+  for (layout_iter = new_keyboard->supported_layouts().begin();
+       layout_iter != new_keyboard->supported_layouts().end();
+       ++layout_iter) {
+    const std::string& layout = *layout_iter;
+    layout_to_keyboard_.insert(std::make_pair(layout, new_keyboard));
+  }
+
   return true;
 }
 
 const VirtualKeyboard* VirtualKeyboardSelector::SelectVirtualKeyboard(
     const std::string& layout) {
   if (layout.empty()) {
     LOG(ERROR) << "No layout is specified";
     return NULL;
   }
 
@@ skipping 55 matching lines @@
     const std::string& layout) {
   const VirtualKeyboard* keyboard =
       SelectVirtualKeyboardInternal(keyboards_, layout);
   if (!keyboard)
     keyboard = SelectVirtualKeyboardInternal(system_keyboards_, layout);
   return keyboard;
 }
 
 }  // namespace input_method
 }  // namespace chromeos