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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm

Issue 7746004: Fix crash with some keyboard shortcuts in Cocoa Panels. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include Cocoa.h explicitly. Created 9 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #import "chrome/browser/ui/panels/panel_browser_window_cocoa.h" 5 #import "chrome/browser/ui/panels/panel_browser_window_cocoa.h"
6 6
7 #include <Carbon/Carbon.h>
7 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
8 9
9 #include "base/command_line.h" 10 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 11 #include "base/debug/debugger.h"
11 #include "base/mac/scoped_nsautorelease_pool.h" 12 #include "base/mac/scoped_nsautorelease_pool.h"
12 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
13 #include "chrome/app/chrome_command_ids.h" // IDC_* 14 #include "chrome/app/chrome_command_ids.h" // IDC_*
14 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_list.h" 16 #include "chrome/browser/ui/browser_list.h"
16 #import "chrome/browser/ui/cocoa/browser_test_helper.h" 17 #import "chrome/browser/ui/cocoa/browser_test_helper.h"
18 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
17 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 19 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
18 #include "chrome/browser/ui/panels/panel.h" 20 #include "chrome/browser/ui/panels/panel.h"
19 #include "chrome/browser/ui/panels/panel_manager.h" 21 #include "chrome/browser/ui/panels/panel_manager.h"
20 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h" 22 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
21 #import "chrome/browser/ui/panels/panel_window_controller_cocoa.h" 23 #import "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
22 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 24 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
23 #include "chrome/common/chrome_notification_types.h" 25 #include "chrome/common/chrome_notification_types.h"
24 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
25 #include "chrome/test/base/ui_test_utils.h" 27 #include "chrome/test/base/ui_test_utils.h"
26 #include "content/browser/tab_contents/test_tab_contents.h" 28 #include "content/browser/tab_contents/test_tab_contents.h"
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 EXPECT_TRUE([close_window_menu_item isEnabled]); 303 EXPECT_TRUE([close_window_menu_item isEnabled]);
302 EXPECT_TRUE([find_menu_item isEnabled]); 304 EXPECT_TRUE([find_menu_item isEnabled]);
303 EXPECT_TRUE([find_previous_menu_item isEnabled]); 305 EXPECT_TRUE([find_previous_menu_item isEnabled]);
304 EXPECT_TRUE([find_next_menu_item isEnabled]); 306 EXPECT_TRUE([find_next_menu_item isEnabled]);
305 EXPECT_FALSE([fullscreen_menu_item isEnabled]); 307 EXPECT_FALSE([fullscreen_menu_item isEnabled]);
306 EXPECT_FALSE([presentation_menu_item isEnabled]); 308 EXPECT_FALSE([presentation_menu_item isEnabled]);
307 EXPECT_FALSE([bookmarks_menu_item isEnabled]); 309 EXPECT_FALSE([bookmarks_menu_item isEnabled]);
308 310
309 ClosePanelAndWait(panel->browser()); 311 ClosePanelAndWait(panel->browser());
310 } 312 }
313
314 TEST_F(PanelBrowserWindowCocoaTest, KeyEvent) {
315 Panel* panel = CreateTestPanel("Test Panel");
316 NSEvent* event = [NSEvent keyEventWithType:NSKeyDown
317 location:NSZeroPoint
318 modifierFlags:NSControlKeyMask
319 timestamp:0.0
320 windowNumber:0
321 context:nil
322 characters:@""
323 charactersIgnoringModifiers:@""
324 isARepeat:NO
325 keyCode:kVK_Tab];
326 PanelBrowserWindowCocoa* native_window =
327 static_cast<PanelBrowserWindowCocoa*>(panel->native_panel());
328 [BrowserWindowUtils handleKeyboardEvent:event
329 inWindow:[native_window->controller_ window]];
330 ClosePanelAndWait(panel->browser());
331 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel_browser_window_cocoa.h ('k') | chrome/browser/ui/panels/panel_window_controller_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698