| Index: ui/base/ime/chromeos/mock_input_method_manager.cc
|
| diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc b/ui/base/ime/chromeos/mock_input_method_manager.cc
|
| similarity index 52%
|
| rename from chrome/browser/chromeos/input_method/mock_input_method_manager.cc
|
| rename to ui/base/ime/chromeos/mock_input_method_manager.cc
|
| index 7dc9f219169ad80f87be174c127581246fded470..0e4c6230686fe0940602e0a911f653ddf9a75a2d 100644
|
| --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
|
| +++ b/ui/base/ime/chromeos/mock_input_method_manager.cc
|
| @@ -2,74 +2,43 @@
|
| // 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/mock_input_method_manager.h"
|
| +#include "ui/base/ime/chromeos/mock_input_method_manager.h"
|
|
|
| #include <utility>
|
|
|
| namespace chromeos {
|
| namespace input_method {
|
| +MockInputMethodManager::State::State() {}
|
|
|
| -MockInputMethodManager::State::State(MockInputMethodManager* manager)
|
| - : manager_(manager) {
|
| - active_input_method_ids.push_back("xkb:us::eng");
|
| -}
|
| -
|
| -MockInputMethodManager::State::~State() {
|
| -}
|
| -
|
| -MockInputMethodManager::MockInputMethodManager()
|
| - : add_observer_count_(0),
|
| - remove_observer_count_(0),
|
| - state_(new State(this)),
|
| - util_(&delegate_),
|
| - mod3_used_(false) {
|
| -}
|
| -
|
| -MockInputMethodManager::~MockInputMethodManager() {
|
| -}
|
| -
|
| -InputMethodManager::UISessionState MockInputMethodManager::GetUISessionState() {
|
| - return InputMethodManager::STATE_BROWSER_SCREEN;
|
| -}
|
| -
|
| -void MockInputMethodManager::AddObserver(
|
| - InputMethodManager::Observer* observer) {
|
| - ++add_observer_count_;
|
| -}
|
| +void MockInputMethodManager::State::AddInputMethodExtension(
|
| + const std::string& extension_id,
|
| + const InputMethodDescriptors& descriptors,
|
| + ui::IMEEngineHandlerInterface* instance) {}
|
|
|
| -void MockInputMethodManager::AddCandidateWindowObserver(
|
| - InputMethodManager::CandidateWindowObserver* observer) {
|
| -}
|
| +void MockInputMethodManager::State::RemoveInputMethodExtension(
|
| + const std::string& extension_id) {}
|
|
|
| -void MockInputMethodManager::AddImeMenuObserver(
|
| - InputMethodManager::ImeMenuObserver* observer) {}
|
| +void MockInputMethodManager::State::ChangeInputMethod(
|
| + const std::string& input_method_id,
|
| + bool show_message) {}
|
|
|
| -void MockInputMethodManager::RemoveObserver(
|
| - InputMethodManager::Observer* observer) {
|
| - ++remove_observer_count_;
|
| +bool MockInputMethodManager::State::EnableInputMethod(
|
| + const std::string& new_active_input_method_id) {
|
| + return true;
|
| }
|
|
|
| -void MockInputMethodManager::RemoveCandidateWindowObserver(
|
| - InputMethodManager::CandidateWindowObserver* observer) {
|
| -}
|
| +void MockInputMethodManager::State::EnableLoginLayouts(
|
| + const std::string& language_code,
|
| + const std::vector<std::string>& initial_layout) {}
|
|
|
| -void MockInputMethodManager::RemoveImeMenuObserver(
|
| - InputMethodManager::ImeMenuObserver* observer) {}
|
| +void MockInputMethodManager::State::EnableLockScreenLayouts() {}
|
|
|
| -std::unique_ptr<InputMethodDescriptors>
|
| -MockInputMethodManager::GetSupportedInputMethods() const {
|
| - std::unique_ptr<InputMethodDescriptors> result(new InputMethodDescriptors);
|
| - result->push_back(
|
| - InputMethodUtil::GetFallbackInputMethodDescriptor());
|
| - return result;
|
| -}
|
| +void MockInputMethodManager::State::GetInputMethodExtensions(
|
| + InputMethodDescriptors* result) {}
|
|
|
| std::unique_ptr<InputMethodDescriptors>
|
| MockInputMethodManager::State::GetActiveInputMethods() const {
|
| - std::unique_ptr<InputMethodDescriptors> result(new InputMethodDescriptors);
|
| - result->push_back(
|
| - InputMethodUtil::GetFallbackInputMethodDescriptor());
|
| - return result;
|
| + return nullptr;
|
| }
|
|
|
| const std::vector<std::string>&
|
| @@ -77,141 +46,110 @@ MockInputMethodManager::State::GetActiveInputMethodIds() const {
|
| return active_input_method_ids;
|
| }
|
|
|
| -size_t MockInputMethodManager::State::GetNumActiveInputMethods() const {
|
| - return 1;
|
| -}
|
| -
|
| const InputMethodDescriptor*
|
| MockInputMethodManager::State::GetInputMethodFromId(
|
| const std::string& input_method_id) const {
|
| - static const InputMethodDescriptor defaultInputMethod =
|
| - InputMethodUtil::GetFallbackInputMethodDescriptor();
|
| - for (size_t i = 0; i < active_input_method_ids.size(); i++) {
|
| - if (input_method_id == active_input_method_ids[i]) {
|
| - return &defaultInputMethod;
|
| - }
|
| - }
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| -void MockInputMethodManager::State::EnableLoginLayouts(
|
| - const std::string& language_code,
|
| - const std::vector<std::string>& initial_layout) {
|
| +size_t MockInputMethodManager::State::GetNumActiveInputMethods() const {
|
| + return active_input_method_ids.size();
|
| }
|
|
|
| -void MockInputMethodManager::State::EnableLockScreenLayouts() {
|
| -}
|
| +void MockInputMethodManager::State::SetEnabledExtensionImes(
|
| + std::vector<std::string>* ids) {}
|
|
|
| -bool MockInputMethodManager::State::ReplaceEnabledInputMethods(
|
| - const std::vector<std::string>& new_active_input_method_ids) {
|
| +void MockInputMethodManager::State::SetInputMethodLoginDefault() {}
|
| +
|
| +void MockInputMethodManager::State::SetInputMethodLoginDefaultFromVPD(
|
| + const std::string& locale,
|
| + const std::string& layout) {}
|
| +
|
| +bool MockInputMethodManager::State::CanCycleInputMethod() {
|
| return true;
|
| }
|
|
|
| -bool MockInputMethodManager::State::EnableInputMethod(
|
| - const std::string& new_active_input_method_id) {
|
| +void MockInputMethodManager::State::SwitchToNextInputMethod() {}
|
| +
|
| +void MockInputMethodManager::State::SwitchToPreviousInputMethod() {}
|
| +
|
| +bool MockInputMethodManager::State::CanSwitchInputMethod(
|
| + const ui::Accelerator& accelerator) {
|
| return true;
|
| }
|
|
|
| -void MockInputMethodManager::State::ChangeInputMethod(
|
| - const std::string& input_method_id,
|
| - bool show_message) {
|
| +void MockInputMethodManager::State::SwitchInputMethod(
|
| + const ui::Accelerator& accelerator) {}
|
| +
|
| +InputMethodDescriptor MockInputMethodManager::State::GetCurrentInputMethod()
|
| + const {
|
| + InputMethodDescriptor descriptor;
|
| + return descriptor;
|
| }
|
|
|
| -void MockInputMethodManager::ActivateInputMethodMenuItem(
|
| - const std::string& key) {
|
| +bool MockInputMethodManager::State::ReplaceEnabledInputMethods(
|
| + const std::vector<std::string>& new_active_input_method_ids) {
|
| + return true;
|
| }
|
|
|
| -void MockInputMethodManager::State::AddInputMethodExtension(
|
| - const std::string& extension_id,
|
| - const InputMethodDescriptors& descriptors,
|
| - ui::IMEEngineHandlerInterface* instance) {}
|
| +MockInputMethodManager::State::~State() {}
|
|
|
| -void MockInputMethodManager::State::RemoveInputMethodExtension(
|
| - const std::string& extension_id) {
|
| -}
|
| +MockInputMethodManager::MockInputMethodManager() {}
|
|
|
| -void MockInputMethodManager::State::GetInputMethodExtensions(
|
| - InputMethodDescriptors* result) {
|
| -}
|
| +MockInputMethodManager::~MockInputMethodManager() {}
|
|
|
| -void MockInputMethodManager::State::SetEnabledExtensionImes(
|
| - std::vector<std::string>* ids) {
|
| +InputMethodManager::UISessionState MockInputMethodManager::GetUISessionState() {
|
| + return InputMethodManager::STATE_BROWSER_SCREEN;
|
| }
|
|
|
| -void MockInputMethodManager::State::SetInputMethodLoginDefault() {
|
| -}
|
| +void MockInputMethodManager::AddObserver(
|
| + InputMethodManager::Observer* observer) {}
|
|
|
| -void MockInputMethodManager::State::SetInputMethodLoginDefaultFromVPD(
|
| - const std::string& locale,
|
| - const std::string& layout) {
|
| -}
|
| +void MockInputMethodManager::AddCandidateWindowObserver(
|
| + InputMethodManager::CandidateWindowObserver* observer) {}
|
|
|
| -bool MockInputMethodManager::State::CanCycleInputMethod() {
|
| - return true;
|
| -}
|
| +void MockInputMethodManager::AddImeMenuObserver(
|
| + InputMethodManager::ImeMenuObserver* observer) {}
|
|
|
| -void MockInputMethodManager::State::SwitchToNextInputMethod() {
|
| -}
|
| +void MockInputMethodManager::RemoveObserver(
|
| + InputMethodManager::Observer* observer) {}
|
|
|
| -void MockInputMethodManager::State::SwitchToPreviousInputMethod() {
|
| -}
|
| +void MockInputMethodManager::RemoveCandidateWindowObserver(
|
| + InputMethodManager::CandidateWindowObserver* observer) {}
|
|
|
| -bool MockInputMethodManager::State::CanSwitchInputMethod(
|
| - const ui::Accelerator& accelerator) {
|
| - return true;
|
| -}
|
| +void MockInputMethodManager::RemoveImeMenuObserver(
|
| + InputMethodManager::ImeMenuObserver* observer) {}
|
|
|
| -void MockInputMethodManager::State::SwitchInputMethod(
|
| - const ui::Accelerator& accelerator) {
|
| +std::unique_ptr<InputMethodDescriptors>
|
| +MockInputMethodManager::GetSupportedInputMethods() const {
|
| + return nullptr;
|
| }
|
|
|
| -InputMethodDescriptor MockInputMethodManager::State::GetCurrentInputMethod()
|
| - const {
|
| - InputMethodDescriptor descriptor =
|
| - InputMethodUtil::GetFallbackInputMethodDescriptor();
|
| - if (!current_input_method_id.empty()) {
|
| - return InputMethodDescriptor(current_input_method_id,
|
| - descriptor.name(),
|
| - descriptor.indicator(),
|
| - descriptor.keyboard_layouts(),
|
| - descriptor.language_codes(),
|
| - true,
|
| - GURL(), // options page url.
|
| - GURL()); // input view page url.
|
| - }
|
| - return descriptor;
|
| -}
|
| +void MockInputMethodManager::ActivateInputMethodMenuItem(
|
| + const std::string& key) {}
|
|
|
| bool MockInputMethodManager::IsISOLevel5ShiftUsedByCurrentInputMethod() const {
|
| - return mod3_used_;
|
| + return false;
|
| }
|
|
|
| bool MockInputMethodManager::IsAltGrUsedByCurrentInputMethod() const {
|
| return false;
|
| }
|
|
|
| -ImeKeyboard* MockInputMethodManager::GetImeKeyboard() { return &keyboard_; }
|
| +ImeKeyboard* MockInputMethodManager::GetImeKeyboard() {
|
| + return nullptr;
|
| +}
|
|
|
| InputMethodUtil* MockInputMethodManager::GetInputMethodUtil() {
|
| - return &util_;
|
| + return nullptr;
|
| }
|
|
|
| ComponentExtensionIMEManager*
|
| - MockInputMethodManager::GetComponentExtensionIMEManager() {
|
| - return comp_ime_manager_.get();
|
| -}
|
| -
|
| -void MockInputMethodManager::SetComponentExtensionIMEManager(
|
| - std::unique_ptr<ComponentExtensionIMEManager> comp_ime_manager) {
|
| - comp_ime_manager_ = std::move(comp_ime_manager);
|
| -}
|
| -
|
| -void MockInputMethodManager::set_application_locale(const std::string& value) {
|
| - delegate_.set_active_locale(value);
|
| +MockInputMethodManager::GetComponentExtensionIMEManager() {
|
| + return nullptr;
|
| }
|
|
|
| -bool MockInputMethodManager::IsLoginKeyboard(
|
| - const std::string& layout) const {
|
| +bool MockInputMethodManager::IsLoginKeyboard(const std::string& layout) const {
|
| return true;
|
| }
|
|
|
| @@ -221,31 +159,16 @@ bool MockInputMethodManager::MigrateInputMethods(
|
| }
|
| scoped_refptr<InputMethodManager::State> MockInputMethodManager::CreateNewState(
|
| Profile* profile) {
|
| - NOTIMPLEMENTED();
|
| - return state_;
|
| + return nullptr;
|
| }
|
|
|
| scoped_refptr<InputMethodManager::State>
|
| MockInputMethodManager::GetActiveIMEState() {
|
| - return scoped_refptr<InputMethodManager::State>(state_.get());
|
| -}
|
| -
|
| -scoped_refptr<InputMethodManager::State> MockInputMethodManager::State::Clone()
|
| - const {
|
| - NOTIMPLEMENTED();
|
| - return manager_->GetActiveIMEState();
|
| + return nullptr;
|
| }
|
|
|
| void MockInputMethodManager::SetState(
|
| - scoped_refptr<InputMethodManager::State> state) {
|
| - state_ = scoped_refptr<MockInputMethodManager::State>(
|
| - static_cast<MockInputMethodManager::State*>(state.get()));
|
| -}
|
| -
|
| -void MockInputMethodManager::SetCurrentInputMethodId(
|
| - const std::string& input_method_id) {
|
| - state_->current_input_method_id = input_method_id;
|
| -}
|
| + scoped_refptr<InputMethodManager::State> state) {}
|
|
|
| void MockInputMethodManager::ImeMenuActivationChanged(bool is_active) {}
|
|
|
| @@ -259,7 +182,7 @@ void MockInputMethodManager::OverrideKeyboardUrlRef(const std::string& keyset) {
|
| }
|
|
|
| bool MockInputMethodManager::IsEmojiHandwritingVoiceOnImeMenuEnabled() {
|
| - return false;
|
| + return true;
|
| }
|
|
|
| } // namespace input_method
|
|
|