| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/chromeos/preferences.h" | 5 #include "chrome/browser/chromeos/preferences.h" | 
| 6 | 6 | 
| 7 #include <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "base/json/json_string_value_serializer.h" | 9 #include "base/json/json_string_value_serializer.h" | 
| 10 #include "base/macros.h" | 10 #include "base/macros.h" | 
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 103         const std::string& id, | 103         const std::string& id, | 
| 104         const InputMethodDescriptors& descriptors, | 104         const InputMethodDescriptors& descriptors, | 
| 105         ui::IMEEngineHandlerInterface* instance) override { | 105         ui::IMEEngineHandlerInterface* instance) override { | 
| 106       InputMethodDescriptor descriptor( | 106       InputMethodDescriptor descriptor( | 
| 107           id, std::string(), std::string(), std::vector<std::string>(), | 107           id, std::string(), std::string(), std::vector<std::string>(), | 
| 108           std::vector<std::string>(), false, GURL(), GURL()); | 108           std::vector<std::string>(), false, GURL(), GURL()); | 
| 109       input_method_extensions_->push_back(descriptor); | 109       input_method_extensions_->push_back(descriptor); | 
| 110     } | 110     } | 
| 111 | 111 | 
| 112    protected: | 112    protected: | 
| 113     ~State() override{}; | 113     ~State() override {} | 
| 114 | 114 | 
| 115    private: | 115    private: | 
| 116     MyMockInputMethodManager* const manager_; | 116     MyMockInputMethodManager* const manager_; | 
| 117     std::unique_ptr<InputMethodDescriptors> input_method_extensions_; | 117     std::unique_ptr<InputMethodDescriptors> input_method_extensions_; | 
| 118   }; | 118   }; | 
| 119 | 119 | 
| 120   MyMockInputMethodManager(StringPrefMember* previous, | 120   MyMockInputMethodManager(StringPrefMember* previous, | 
| 121                            StringPrefMember* current) | 121                            StringPrefMember* current) | 
| 122       : previous_(previous), | 122       : previous_(previous), | 
| 123         current_(current) { | 123         current_(current) { | 
| (...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 679         "Syncable values should have added local values on initialization."); | 679         "Syncable values should have added local values on initialization."); | 
| 680     ExpectGlobalValues( | 680     ExpectGlobalValues( | 
| 681         "es,en-US", | 681         "es,en-US", | 
| 682         "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," + | 682         "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," + | 
| 683             ToInputMethodIds("xkb:jp::jpn"), | 683             ToInputMethodIds("xkb:jp::jpn"), | 
| 684         std::string(kIdentityIMEID) + "," + kUnknownIMEID); | 684         std::string(kIdentityIMEID) + "," + kUnknownIMEID); | 
| 685   } | 685   } | 
| 686 } | 686 } | 
| 687 | 687 | 
| 688 }  // namespace chromeos | 688 }  // namespace chromeos | 
| OLD | NEW | 
|---|