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

Unified Diff: chrome/browser/global_keyboard_shortcuts_mac_browsertest.mm

Issue 1250533003: [Mac] Remove BrowserCommandExecutor protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 5 years, 5 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
Index: chrome/browser/global_keyboard_shortcuts_mac_browsertest.mm
diff --git a/chrome/browser/global_keyboard_shortcuts_mac_browsertest.mm b/chrome/browser/global_keyboard_shortcuts_mac_browsertest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..3e6b7f2dad86366f93d7a8c970122aef7a4d6bb9
--- /dev/null
+++ b/chrome/browser/global_keyboard_shortcuts_mac_browsertest.mm
@@ -0,0 +1,45 @@
+// Copyright 2015 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.
+
+#import "chrome/browser/global_keyboard_shortcuts_mac.h"
+
+#import <Cocoa/Cocoa.h>
+
+#include "base/run_loop.h"
+#include "chrome/browser/extensions/extension_browsertest.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#import "ui/events/test/cocoa_test_event_utils.h"
+
+using cocoa_test_event_utils::SynthesizeKeyEvent;
+
+using GlobalKeyboardShortcutsTest = ExtensionBrowserTest;
+
+// Test that global keyboard shortcuts are handled by the native window.
+IN_PROC_BROWSER_TEST_F(GlobalKeyboardShortcutsTest, SwitchTabsMac) {
+ NSWindow* ns_window = browser()->window()->GetNativeWindow();
+ TabStripModel* tab_strip = browser()->tab_strip_model();
+
+ // Set up window with 2 tabs.
+ chrome::NewTab(browser());
+ EXPECT_EQ(2, tab_strip->count());
+ EXPECT_TRUE(tab_strip->IsTabSelected(1));
+
+ // Ctrl+Tab goes to the next tab, which loops back to the first tab.
+ [ns_window performKeyEquivalent:SynthesizeKeyEvent(
+ ns_window, true, ui::VKEY_TAB, NSControlKeyMask)];
+ EXPECT_TRUE(tab_strip->IsTabSelected(0));
+
+ // Cmd+2 goes to the second tab.
+ [ns_window performKeyEquivalent:SynthesizeKeyEvent(
+ ns_window, true, ui::VKEY_2, NSCommandKeyMask)];
+ EXPECT_TRUE(tab_strip->IsTabSelected(1));
+
+ // Cmd+{ goes to the previous tab.
+ [ns_window performKeyEquivalent:SynthesizeKeyEvent(
+ ns_window, true, ui::VKEY_OEM_4, NSShiftKeyMask | NSCommandKeyMask)];
+ EXPECT_TRUE(tab_strip->IsTabSelected(0));
+}
« no previous file with comments | « chrome/browser/global_keyboard_shortcuts_mac.mm ('k') | chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698