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

Side by Side Diff: ui/views/mus/input_method_mus.h

Issue 2298123003: Using input language instead of the application locale to determine the Omnibox's text input type o… (Closed)
Patch Set: fix compiling errors in mus. Created 4 years, 3 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
« no previous file with comments | « ui/views/controls/textfield/textfield_unittest.cc ('k') | ui/views/mus/input_method_mus.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 (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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 "ui/base/ime/input_method_base.h" 5 #include "ui/base/ime/input_method_base.h"
6 6
7 #ifndef UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ 7 #ifndef UI_VIEWS_MUS_INPUT_METHOD_MUS_H_
8 #define UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ 8 #define UI_VIEWS_MUS_INPUT_METHOD_MUS_H_
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 21 matching lines...) Expand all
32 // Overridden from ui::InputMethod: 32 // Overridden from ui::InputMethod:
33 void OnFocus() override; 33 void OnFocus() override;
34 void OnBlur() override; 34 void OnBlur() override;
35 bool OnUntranslatedIMEMessage(const base::NativeEvent& event, 35 bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
36 NativeEventResult* result) override; 36 NativeEventResult* result) override;
37 void DispatchKeyEvent(ui::KeyEvent* event) override; 37 void DispatchKeyEvent(ui::KeyEvent* event) override;
38 void OnTextInputTypeChanged(const ui::TextInputClient* client) override; 38 void OnTextInputTypeChanged(const ui::TextInputClient* client) override;
39 void OnCaretBoundsChanged(const ui::TextInputClient* client) override; 39 void OnCaretBoundsChanged(const ui::TextInputClient* client) override;
40 void CancelComposition(const ui::TextInputClient* client) override; 40 void CancelComposition(const ui::TextInputClient* client) override;
41 void OnInputLocaleChanged() override; 41 void OnInputLocaleChanged() override;
42 std::string GetInputLocale() override;
43 bool IsCandidatePopupOpen() const override; 42 bool IsCandidatePopupOpen() const override;
44 43
45 private: 44 private:
46 friend TextInputClientImpl; 45 friend TextInputClientImpl;
47 46
48 // Overridden from ui::InputMethodBase: 47 // Overridden from ui::InputMethodBase:
49 void OnDidChangeFocusedClient(ui::TextInputClient* focused_before, 48 void OnDidChangeFocusedClient(ui::TextInputClient* focused_before,
50 ui::TextInputClient* focused) override; 49 ui::TextInputClient* focused) override;
51 50
52 void UpdateTextInputType(); 51 void UpdateTextInputType();
53 52
54 // The toplevel window which is not owned by this class. This may be null 53 // The toplevel window which is not owned by this class. This may be null
55 // for tests. 54 // for tests.
56 ui::Window* window_; 55 ui::Window* window_;
57 56
58 ui::mojom::IMEServerPtr ime_server_; 57 ui::mojom::IMEServerPtr ime_server_;
59 ui::mojom::InputMethodPtr input_method_; 58 ui::mojom::InputMethodPtr input_method_;
60 std::unique_ptr<TextInputClientImpl> text_input_client_; 59 std::unique_ptr<TextInputClientImpl> text_input_client_;
61 60
62 DISALLOW_COPY_AND_ASSIGN(InputMethodMus); 61 DISALLOW_COPY_AND_ASSIGN(InputMethodMus);
63 }; 62 };
64 63
65 } // namespace views 64 } // namespace views
66 65
67 #endif // UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ 66 #endif // UI_VIEWS_MUS_INPUT_METHOD_MUS_H_
OLDNEW
« no previous file with comments | « ui/views/controls/textfield/textfield_unittest.cc ('k') | ui/views/mus/input_method_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698