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/profiler/scoped_profile.h" | 7 #include "base/profiler/scoped_profile.h" |
8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/browser/chromeos/input_method/input_method_engine.h" | 10 #include "chrome/browser/chromeos/input_method/input_method_engine.h" |
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
483 EXTENSION_FUNCTION_VALIDATE( | 483 EXTENSION_FUNCTION_VALIDATE( |
484 segments_args[i]->style != | 484 segments_args[i]->style != |
485 SetComposition::Params::Parameters::SegmentsType::STYLE_NONE); | 485 SetComposition::Params::Parameters::SegmentsType::STYLE_NONE); |
486 segments.push_back(InputMethodEngineInterface::SegmentInfo()); | 486 segments.push_back(InputMethodEngineInterface::SegmentInfo()); |
487 segments.back().start = segments_args[i]->start; | 487 segments.back().start = segments_args[i]->start; |
488 segments.back().end = segments_args[i]->end; | 488 segments.back().end = segments_args[i]->end; |
489 if (segments_args[i]->style == | 489 if (segments_args[i]->style == |
490 SetComposition::Params::Parameters::SegmentsType::STYLE_UNDERLINE) { | 490 SetComposition::Params::Parameters::SegmentsType::STYLE_UNDERLINE) { |
491 segments.back().style = | 491 segments.back().style = |
492 InputMethodEngineInterface::SEGMENT_STYLE_UNDERLINE; | 492 InputMethodEngineInterface::SEGMENT_STYLE_UNDERLINE; |
| 493 } else if (segments_args[i]->style == |
| 494 SetComposition::Params::Parameters::SegmentsType:: |
| 495 STYLE_DOUBLEUNDERLINE) { |
| 496 segments.back().style = |
| 497 InputMethodEngineInterface::SEGMENT_STYLE_DOUBLE_UNDERLINE; |
493 } else { | 498 } else { |
494 segments.back().style = | 499 segments.back().style = |
495 InputMethodEngineInterface::SEGMENT_STYLE_DOUBLE_UNDERLINE; | 500 InputMethodEngineInterface::SEGMENT_STYLE_NO_UNDERLINE; |
496 } | 501 } |
497 } | 502 } |
498 } | 503 } |
499 | 504 |
500 int selection_start = | 505 int selection_start = |
501 params.selection_start ? *params.selection_start : params.cursor; | 506 params.selection_start ? *params.selection_start : params.cursor; |
502 int selection_end = | 507 int selection_end = |
503 params.selection_end ? *params.selection_end : params.cursor; | 508 params.selection_end ? *params.selection_end : params.cursor; |
504 | 509 |
505 SetResult(new base::FundamentalValue( | 510 SetResult(new base::FundamentalValue( |
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
856 // Notifies the IME extension for IME ready with onActivate/onFocus events. | 861 // Notifies the IME extension for IME ready with onActivate/onFocus events. |
857 if (engine) | 862 if (engine) |
858 engine->Enable(engine->GetActiveComponentId()); | 863 engine->Enable(engine->GetActiveComponentId()); |
859 } | 864 } |
860 | 865 |
861 InputImeEventRouter* InputImeAPI::input_ime_event_router() { | 866 InputImeEventRouter* InputImeAPI::input_ime_event_router() { |
862 return InputImeEventRouter::GetInstance(); | 867 return InputImeEventRouter::GetInstance(); |
863 } | 868 } |
864 | 869 |
865 } // namespace extensions | 870 } // namespace extensions |
OLD | NEW |