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

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

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/mus/input_method_mus.h ('k') | no next file » | 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/views/mus/input_method_mus.h" 5 #include "ui/views/mus/input_method_mus.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "services/ui/public/cpp/window.h" 9 #include "services/ui/public/cpp/window.h"
10 #include "services/ui/public/interfaces/ime.mojom.h" 10 #include "services/ui/public/interfaces/ime.mojom.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 void InputMethodMus::CancelComposition(const ui::TextInputClient* client) { 95 void InputMethodMus::CancelComposition(const ui::TextInputClient* client) {
96 if (input_method_) 96 if (input_method_)
97 input_method_->CancelComposition(); 97 input_method_->CancelComposition();
98 } 98 }
99 99
100 void InputMethodMus::OnInputLocaleChanged() { 100 void InputMethodMus::OnInputLocaleChanged() {
101 // TODO(moshayedi): crbug.com/637418. Not supported in ChromeOS. Investigate 101 // TODO(moshayedi): crbug.com/637418. Not supported in ChromeOS. Investigate
102 // whether we want to support this or not. 102 // whether we want to support this or not.
103 } 103 }
104 104
105 std::string InputMethodMus::GetInputLocale() {
106 // TODO(moshayedi): crbug.com/637418. Not supported in ChromeOS. Investigate
107 // whether we want to support this or not.
108 return std::string();
109 }
110
111 bool InputMethodMus::IsCandidatePopupOpen() const { 105 bool InputMethodMus::IsCandidatePopupOpen() const {
112 // TODO(moshayedi): crbug.com/637416. Implement this properly when we have a 106 // TODO(moshayedi): crbug.com/637416. Implement this properly when we have a
113 // mean for displaying candidate list popup. 107 // mean for displaying candidate list popup.
114 return false; 108 return false;
115 } 109 }
116 110
117 void InputMethodMus::OnDidChangeFocusedClient( 111 void InputMethodMus::OnDidChangeFocusedClient(
118 ui::TextInputClient* focused_before, 112 ui::TextInputClient* focused_before,
119 ui::TextInputClient* focused) { 113 ui::TextInputClient* focused) {
120 InputMethodBase::OnDidChangeFocusedClient(focused_before, focused); 114 InputMethodBase::OnDidChangeFocusedClient(focused_before, focused);
(...skipping 10 matching lines...) Expand all
131 state->type = mojo::ConvertTo<mojo::TextInputType>(type); 125 state->type = mojo::ConvertTo<mojo::TextInputType>(type);
132 if (window_) { 126 if (window_) {
133 if (type != ui::TEXT_INPUT_TYPE_NONE) 127 if (type != ui::TEXT_INPUT_TYPE_NONE)
134 window_->SetImeVisibility(true, std::move(state)); 128 window_->SetImeVisibility(true, std::move(state));
135 else 129 else
136 window_->SetTextInputState(std::move(state)); 130 window_->SetTextInputState(std::move(state));
137 } 131 }
138 } 132 }
139 133
140 } // namespace views 134 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/input_method_mus.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698