Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_engine.cc

Issue 150723006: Make input_methods.txt to be able to specify indicator string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more consistent Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/input_method_engine.h" 5 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
6 6
7 #define XK_MISCELLANY 7 #define XK_MISCELLANY
8 #include <X11/keysymdef.h> 8 #include <X11/keysymdef.h>
9 #include <X11/X.h> 9 #include <X11/X.h>
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 manager->GetComponentExtensionIMEManager(); 89 manager->GetComponentExtensionIMEManager();
90 90
91 if (comp_ext_ime_manager->IsInitialized() && 91 if (comp_ext_ime_manager->IsInitialized() &&
92 comp_ext_ime_manager->IsWhitelistedExtension(extension_id)) { 92 comp_ext_ime_manager->IsWhitelistedExtension(extension_id)) {
93 imm_id_ = comp_ext_ime_manager->GetId(extension_id, engine_id); 93 imm_id_ = comp_ext_ime_manager->GetId(extension_id, engine_id);
94 } else { 94 } else {
95 imm_id_ = extension_ime_util::GetInputMethodID(extension_id, engine_id); 95 imm_id_ = extension_ime_util::GetInputMethodID(extension_id, engine_id);
96 } 96 }
97 97
98 input_view_url_ = input_view; 98 input_view_url_ = input_view;
99 descriptor_ = input_method::InputMethodDescriptor(imm_id_, 99 descriptor_ = input_method::InputMethodDescriptor(
100 engine_name, 100 imm_id_,
101 layouts, 101 engine_name,
102 languages, 102 std::string(), // TODO(uekawa): Set short name.
103 false, // is_login_keyboard 103 layouts,
104 options_page, 104 languages,
105 input_view); 105 false, // is_login_keyboard
106 options_page,
107 input_view);
106 108
107 // TODO(komatsu): It is probably better to call AddInputMethodExtension 109 // TODO(komatsu): It is probably better to call AddInputMethodExtension
108 // out of Initialize. 110 // out of Initialize.
109 manager->AddInputMethodExtension(imm_id_, this); 111 manager->AddInputMethodExtension(imm_id_, this);
110 } 112 }
111 113
112 const input_method::InputMethodDescriptor& InputMethodEngine::GetDescriptor() 114 const input_method::InputMethodDescriptor& InputMethodEngine::GetDescriptor()
113 const { 115 const {
114 return descriptor_; 116 return descriptor_;
115 } 117 }
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 // TODO(nona): Implement it. 618 // TODO(nona): Implement it.
617 break; 619 break;
618 } 620 }
619 } 621 }
620 } 622 }
621 623
622 // TODO(nona): Support item.children. 624 // TODO(nona): Support item.children.
623 } 625 }
624 626
625 } // namespace chromeos 627 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698