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/input_method/ibus_ui_controller.h" | 5 #include "chrome/browser/chromeos/input_method/ibus_ui_controller.h" |
6 | 6 |
7 #if defined(HAVE_IBUS) | 7 #if defined(HAVE_IBUS) |
8 #include <ibus.h> | 8 #include <ibus.h> |
9 #endif | 9 #endif |
10 | 10 |
11 #include <sstream> | 11 #include <sstream> |
12 | 12 |
13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
16 #include "base/string_util.h" | 16 #include "base/string_util.h" |
17 #include "chrome/browser/chromeos/input_method/input_method_descriptor.h" | 17 #include "chrome/browser/chromeos/input_method/input_method_descriptor.h" |
18 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 18 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
19 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 19 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
20 #include "third_party/mozc/session/candidates_lite.pb.h" | 20 #include "third_party/mozc/session/candidates_lite.pb.h" |
21 #include "ui/aura/client/aura_constants.h" | 21 #include "ui/aura/client/aura_constants.h" |
22 #include "ui/aura/root_window.h" | 22 #include "ui/aura/root_window.h" |
23 #include "ui/base/ime/ibus_client_impl.h" | |
24 #include "ui/base/ime/input_method_ibus.h" | 23 #include "ui/base/ime/input_method_ibus.h" |
25 | 24 |
26 namespace chromeos { | 25 namespace chromeos { |
27 namespace input_method { | 26 namespace input_method { |
28 namespace { | 27 namespace { |
29 | 28 |
30 bool IsActive(const std::string& input_method_id, | 29 bool IsActive(const std::string& input_method_id, |
31 const InputMethodDescriptors* descriptors) { | 30 const InputMethodDescriptors* descriptors) { |
32 for (size_t i = 0; i < descriptors->size(); ++i) { | 31 for (size_t i = 0; i < descriptors->size(); ++i) { |
33 if (descriptors->at(i).id() == input_method_id) { | 32 if (descriptors->at(i).id() == input_method_id) { |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 observers_.AddObserver(observer); | 273 observers_.AddObserver(observer); |
275 } | 274 } |
276 | 275 |
277 // IBusUiController override. | 276 // IBusUiController override. |
278 virtual void RemoveObserver(Observer* observer) OVERRIDE { | 277 virtual void RemoveObserver(Observer* observer) OVERRIDE { |
279 observers_.RemoveObserver(observer); | 278 observers_.RemoveObserver(observer); |
280 } | 279 } |
281 | 280 |
282 private: | 281 private: |
283 // A class for customizing the behavior of ui::InputMethodIBus for Chrome OS. | 282 // A class for customizing the behavior of ui::InputMethodIBus for Chrome OS. |
284 class IBusChromeOSClientImpl : public ui::internal::IBusClientImpl { | 283 class IBusChromeOSClientImpl : public ui::internal::IBusClient { |
285 public: | 284 public: |
286 explicit IBusChromeOSClientImpl(IBusUiControllerImpl* ui) | 285 explicit IBusChromeOSClientImpl(IBusUiControllerImpl* ui) |
287 : ui_(ui) { | 286 : ui_(ui) { |
288 } | 287 } |
289 | 288 |
290 // ui::IBusClient override. | 289 // ui::IBusClient override. |
291 virtual InputMethodType GetInputMethodType() OVERRIDE { | 290 virtual InputMethodType GetInputMethodType() OVERRIDE { |
292 const std::string current_input_method_id = GetCurrentInputMethodId(); | 291 const std::string current_input_method_id = GetCurrentInputMethodId(); |
293 return InputMethodUtil::IsKeyboardLayout(current_input_method_id) ? | 292 return InputMethodUtil::IsKeyboardLayout(current_input_method_id) ? |
294 INPUT_METHOD_XKB_LAYOUT : INPUT_METHOD_NORMAL; | 293 INPUT_METHOD_XKB_LAYOUT : INPUT_METHOD_NORMAL; |
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
732 IBusUiController::~IBusUiController() { | 731 IBusUiController::~IBusUiController() { |
733 } | 732 } |
734 | 733 |
735 bool IsActiveForTesting(const std::string& input_method_id, | 734 bool IsActiveForTesting(const std::string& input_method_id, |
736 const InputMethodDescriptors* descriptors) { | 735 const InputMethodDescriptors* descriptors) { |
737 return IsActive(input_method_id, descriptors); | 736 return IsActive(input_method_id, descriptors); |
738 } | 737 } |
739 | 738 |
740 } // namespace input_method | 739 } // namespace input_method |
741 } // namespace chromeos | 740 } // namespace chromeos |
OLD | NEW |