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

Unified Diff: ui/base/ime/input_method_mac.mm

Issue 782673002: MacViews: tryjobs for toolkit_views=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/buildbot/chromium.mac.json ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/input_method_mac.mm
diff --git a/ui/base/ime/input_method_mac.mm b/ui/base/ime/input_method_mac.mm
index 04105fac648e2ef3bcdd46b5f8039129d847c9d3..361656abe0b708d5c5255af2d494c15ccae94989 100644
--- a/ui/base/ime/input_method_mac.mm
+++ b/ui/base/ime/input_method_mac.mm
@@ -4,6 +4,8 @@
#include "ui/base/ime/input_method_mac.h"
+#import <Cocoa/Cocoa.h>
+
namespace ui {
InputMethodMac::InputMethodMac(internal::InputMethodDelegate* delegate) {
@@ -15,6 +17,7 @@ InputMethodMac::~InputMethodMac() {
bool InputMethodMac::OnUntranslatedIMEMessage(const base::NativeEvent& event,
NativeEventResult* result) {
+ NOTREACHED(); // Only called on Windows.
return false;
}
@@ -24,15 +27,23 @@ bool InputMethodMac::DispatchKeyEvent(const ui::KeyEvent& event) {
}
void InputMethodMac::OnCaretBoundsChanged(const TextInputClient* client) {
+ // Call invalidateCharacterCoordinates?
}
void InputMethodMac::CancelComposition(const TextInputClient* client) {
+ [[NSTextInputContext currentInputContext] discardMarkedText];
}
void InputMethodMac::OnInputLocaleChanged() {
+ NOTREACHED(); // Only called on Windows.
}
std::string InputMethodMac::GetInputLocale() {
+ NSArray* input_locales = [[NSTextInputContext currentInputContext] allowedInputSourceLocales];
+ for (NSString* s in input_locales) {
+ NSLog(@"locale[i]=%@\n", s);
+ }
+ DLOG(INFO) << "returning";
return "";
}
« no previous file with comments | « testing/buildbot/chromium.mac.json ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698