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

Unified Diff: ui/events/test/keyboard_layout_mac.cc

Issue 2353333002: Reland of Force U.S. English keyboard layout for TextfieldTest.KeysWithModifiersTest (Closed)
Patch Set: Use ScopedCFTypeRef instead of PlatformKeyboardLayout 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/test/keyboard_layout.cc ('k') | ui/events/test/keyboard_layout_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/test/keyboard_layout_mac.cc
diff --git a/ui/events/test/keyboard_layout_mac.cc b/ui/events/test/keyboard_layout_mac.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a6e2060187f4baf6239b5bcea09c1072216192c6
--- /dev/null
+++ b/ui/events/test/keyboard_layout_mac.cc
@@ -0,0 +1,47 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/events/test/keyboard_layout.h"
+
+#include "base/logging.h"
+
+namespace ui {
+
+PlatformKeyboardLayout GetPlatformKeyboardLayout(KeyboardLayout layout) {
+ // Right now tests only need US English. If other layouts need to be
+ // supported in the future this code should be extended.
+ DCHECK_EQ(KEYBOARD_LAYOUT_ENGLISH_US, layout);
+
+ const char kUsInputSourceId[] = "com.apple.keylayout.US";
+
+ base::ScopedCFTypeRef<CFMutableDictionaryRef> input_source_list_filter(
+ CFDictionaryCreateMutable(kCFAllocatorDefault, 1,
+ &kCFTypeDictionaryKeyCallBacks,
+ &kCFTypeDictionaryValueCallBacks));
+ base::ScopedCFTypeRef<CFStringRef> input_source_id_ref(
+ CFStringCreateWithCString(kCFAllocatorDefault, kUsInputSourceId,
+ kCFStringEncodingUTF8));
+ CFDictionaryAddValue(input_source_list_filter, kTISPropertyInputSourceID,
+ input_source_id_ref);
+ base::ScopedCFTypeRef<CFArrayRef> input_source_list(
+ TISCreateInputSourceList(input_source_list_filter, true));
+ if (CFArrayGetCount(input_source_list) != 1)
+ return PlatformKeyboardLayout();
+
+ return base::ScopedCFTypeRef<TISInputSourceRef>(
+ (TISInputSourceRef)CFArrayGetValueAtIndex(input_source_list, 0),
+ base::scoped_policy::RETAIN);
+}
+
+PlatformKeyboardLayout ScopedKeyboardLayout::GetActiveLayout() {
+ return PlatformKeyboardLayout(TISCopyCurrentKeyboardInputSource());
+}
+
+void ScopedKeyboardLayout::ActivateLayout(PlatformKeyboardLayout layout) {
+ DCHECK(layout);
+ OSStatus result = TISSelectInputSource(layout);
+ DCHECK_EQ(noErr, result);
+}
+
+} // namespace ui
« no previous file with comments | « ui/events/test/keyboard_layout.cc ('k') | ui/events/test/keyboard_layout_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698