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

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

Issue 680383008: Move ash/ime to ui/chromeos/ime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash48_global_command
Patch Set: Created 6 years, 1 month 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
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 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "chrome/browser/chromeos/input_method/input_method_engine_interface.h" 12 #include "chrome/browser/chromeos/input_method/input_method_engine_interface.h"
13 #include "chromeos/ime/input_method_descriptor.h" 13 #include "chromeos/ime/input_method_descriptor.h"
14 #include "url/gurl.h" 14 #include "url/gurl.h"
15 15
16 class Profile; 16 class Profile;
17 17
18 namespace ui { 18 namespace ui {
19 class CandidateWindow; 19 class CandidateWindow;
20 class KeyEvent; 20 class KeyEvent;
21 } // namespace ui
22 21
23 namespace ash {
24 namespace ime { 22 namespace ime {
25 struct InputMethodMenuItem; 23 struct InputMethodMenuItem;
26 } // namespace ime 24 } // namespace ime
27 } // namespace ash 25 } // namespace ui
28 26
29 namespace chromeos { 27 namespace chromeos {
30 28
31 class CompositionText; 29 class CompositionText;
32 30
33 namespace input_method { 31 namespace input_method {
34 struct KeyEventHandle; 32 struct KeyEventHandle;
35 } // namespace input_method 33 } // namespace input_method
36 34
37 class InputMethodEngine : public InputMethodEngineInterface { 35 class InputMethodEngine : public InputMethodEngineInterface {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 virtual void SetSurroundingText(const std::string& text, uint32 cursor_pos, 88 virtual void SetSurroundingText(const std::string& text, uint32 cursor_pos,
91 uint32 anchor_pos) override; 89 uint32 anchor_pos) override;
92 virtual void HideInputView() override; 90 virtual void HideInputView() override;
93 virtual void SetCompositionBounds(const gfx::Rect& bounds) override; 91 virtual void SetCompositionBounds(const gfx::Rect& bounds) override;
94 92
95 int GetCotextIdForTesting() { return context_id_; } 93 int GetCotextIdForTesting() { return context_id_; }
96 94
97 private: 95 private:
98 // Converts MenuItem to InputMethodMenuItem. 96 // Converts MenuItem to InputMethodMenuItem.
99 void MenuItemToProperty(const MenuItem& item, 97 void MenuItemToProperty(const MenuItem& item,
100 ash::ime::InputMethodMenuItem* property); 98 ui::ime::InputMethodMenuItem* property);
101 99
102 // Enables overriding input view page to Virtual Keyboard window. 100 // Enables overriding input view page to Virtual Keyboard window.
103 void EnableInputView(); 101 void EnableInputView();
104 102
105 ui::TextInputType current_input_type_; 103 ui::TextInputType current_input_type_;
106 104
107 // ID that is used for the current input context. False if there is no focus. 105 // ID that is used for the current input context. False if there is no focus.
108 int context_id_; 106 int context_id_;
109 107
110 // Next id that will be assigned to a context. 108 // Next id that will be assigned to a context.
(...skipping 28 matching lines...) Expand all
139 std::map<int, int> candidate_indexes_; 137 std::map<int, int> candidate_indexes_;
140 138
141 // Used with SendKeyEvents and ProcessKeyEvent to check if the key event 139 // Used with SendKeyEvents and ProcessKeyEvent to check if the key event
142 // sent to ProcessKeyEvent is sent by SendKeyEvents. 140 // sent to ProcessKeyEvent is sent by SendKeyEvents.
143 const ui::KeyEvent* sent_key_event_; 141 const ui::KeyEvent* sent_key_event_;
144 }; 142 };
145 143
146 } // namespace chromeos 144 } // namespace chromeos
147 145
148 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ 146 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698