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/extensions/api/input_ime/input_ime_api.h" | 5 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" |
6 | 6 |
7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 9 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
10 #include "chrome/browser/profiles/profile_manager.h" | 10 #include "chrome/browser/profiles/profile_manager.h" |
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 | 545 |
546 const std::vector<linked_ptr<input_ime::KeyboardEvent> >& key_data = | 546 const std::vector<linked_ptr<input_ime::KeyboardEvent> >& key_data = |
547 params.key_data; | 547 params.key_data; |
548 std::vector<chromeos::InputMethodEngineInterface::KeyboardEvent> key_data_out; | 548 std::vector<chromeos::InputMethodEngineInterface::KeyboardEvent> key_data_out; |
549 | 549 |
550 for (size_t i = 0; i < key_data.size(); ++i) { | 550 for (size_t i = 0; i < key_data.size(); ++i) { |
551 chromeos::InputMethodEngineInterface::KeyboardEvent event; | 551 chromeos::InputMethodEngineInterface::KeyboardEvent event; |
552 event.type = input_ime::KeyboardEvent::ToString(key_data[i]->type); | 552 event.type = input_ime::KeyboardEvent::ToString(key_data[i]->type); |
553 event.key = key_data[i]->key; | 553 event.key = key_data[i]->key; |
554 event.code = key_data[i]->code; | 554 event.code = key_data[i]->code; |
| 555 event.key_code = key_data[i]->key_code.get() ? *(key_data[i]->key_code) : 0; |
555 if (key_data[i]->alt_key) | 556 if (key_data[i]->alt_key) |
556 event.alt_key = *(key_data[i]->alt_key); | 557 event.alt_key = *(key_data[i]->alt_key); |
557 if (key_data[i]->ctrl_key) | 558 if (key_data[i]->ctrl_key) |
558 event.ctrl_key = *(key_data[i]->ctrl_key); | 559 event.ctrl_key = *(key_data[i]->ctrl_key); |
559 if (key_data[i]->shift_key) | 560 if (key_data[i]->shift_key) |
560 event.shift_key = *(key_data[i]->shift_key); | 561 event.shift_key = *(key_data[i]->shift_key); |
561 if (key_data[i]->caps_lock) | 562 if (key_data[i]->caps_lock) |
562 event.caps_lock = *(key_data[i]->caps_lock); | 563 event.caps_lock = *(key_data[i]->caps_lock); |
563 key_data_out.push_back(event); | 564 key_data_out.push_back(event); |
564 } | 565 } |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
838 input_ime_event_router()->GetActiveEngine(details.extension_id); | 839 input_ime_event_router()->GetActiveEngine(details.extension_id); |
839 if (engine) | 840 if (engine) |
840 engine->NotifyImeReady(); | 841 engine->NotifyImeReady(); |
841 } | 842 } |
842 | 843 |
843 InputImeEventRouter* InputImeAPI::input_ime_event_router() { | 844 InputImeEventRouter* InputImeAPI::input_ime_event_router() { |
844 return InputImeEventRouter::GetInstance(); | 845 return InputImeEventRouter::GetInstance(); |
845 } | 846 } |
846 | 847 |
847 } // namespace extensions | 848 } // namespace extensions |
OLD | NEW |