| 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/ui/ash/ime_controller_chromeos.h" | 5 #include "chrome/browser/ui/ash/ime_controller_chromeos.h" |
| 6 | 6 |
| 7 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 7 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
| 8 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 8 #include "chromeos/ime/input_method_manager.h" |
| 9 #include "ui/base/accelerators/accelerator.h" | 9 #include "ui/base/accelerators/accelerator.h" |
| 10 | 10 |
| 11 bool ImeController::HandleNextIme() { | 11 bool ImeController::HandleNextIme() { |
| 12 chromeos::input_method::InputMethodManager* manager = | 12 chromeos::input_method::InputMethodManager* manager = |
| 13 chromeos::input_method::GetInputMethodManager(); | 13 chromeos::input_method::GetInputMethodManager(); |
| 14 return manager->SwitchToNextInputMethod(); | 14 return manager->SwitchToNextInputMethod(); |
| 15 } | 15 } |
| 16 | 16 |
| 17 bool ImeController::HandlePreviousIme() { | 17 bool ImeController::HandlePreviousIme() { |
| 18 chromeos::input_method::InputMethodManager* manager = | 18 chromeos::input_method::InputMethodManager* manager = |
| (...skipping 29 matching lines...) Expand all Loading... |
| 48 } | 48 } |
| 49 | 49 |
| 50 bool ImeController::UsingFrenchInputMethod() const { | 50 bool ImeController::UsingFrenchInputMethod() const { |
| 51 chromeos::input_method::InputMethodManager* manager = | 51 chromeos::input_method::InputMethodManager* manager = |
| 52 chromeos::input_method::GetInputMethodManager(); | 52 chromeos::input_method::GetInputMethodManager(); |
| 53 const chromeos::input_method::InputMethodDescriptor& descriptor = | 53 const chromeos::input_method::InputMethodDescriptor& descriptor = |
| 54 manager->GetCurrentInputMethod(); | 54 manager->GetCurrentInputMethod(); |
| 55 const std::string& layout = descriptor.id(); | 55 const std::string& layout = descriptor.id(); |
| 56 return (layout == "xkb:fr::fra" || layout == "xkb:be::fra"); | 56 return (layout == "xkb:fr::fra" || layout == "xkb:be::fra"); |
| 57 } | 57 } |
| OLD | NEW |