OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/cocoa/fullscreen_exit_bubble_controller.h" | 5 #import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h" |
6 | 6 |
7 #include "base/mac/mac_util.h" | 7 #include "base/mac/mac_util.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
11 #include "chrome/browser/ui/cocoa/browser_window_controller.h" | 11 #include "chrome/browser/ui/cocoa/browser_window_controller.h" |
12 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 12 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "chrome/test/base/testing_profile.h" |
14 #include "content/public/browser/notification_service.h" | 15 #include "content/public/browser/notification_service.h" |
15 #include "content/public/browser/site_instance.h" | 16 #include "content/public/browser/site_instance.h" |
16 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
17 #include "content/public/test/test_utils.h" | 18 #include "content/public/test/test_utils.h" |
18 #include "testing/gtest_mac.h" | 19 #include "testing/gtest_mac.h" |
19 #include "ui/base/accelerators/platform_accelerator_cocoa.h" | 20 #include "ui/base/accelerators/platform_accelerator_cocoa.h" |
20 | 21 |
21 using content::SiteInstance; | 22 using content::SiteInstance; |
22 using content::WebContents; | 23 using content::WebContents; |
23 | 24 |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 ui::PlatformAcceleratorCocoa cmd_F(@"F", NSCommandKeyMask); | 120 ui::PlatformAcceleratorCocoa cmd_F(@"F", NSCommandKeyMask); |
120 ui::PlatformAcceleratorCocoa cmd_shift_f( | 121 ui::PlatformAcceleratorCocoa cmd_shift_f( |
121 @"f", NSCommandKeyMask | NSShiftKeyMask); | 122 @"f", NSCommandKeyMask | NSShiftKeyMask); |
122 NSString* cmd_F_text = [FullscreenExitBubbleController | 123 NSString* cmd_F_text = [FullscreenExitBubbleController |
123 keyCombinationForAccelerator:cmd_F]; | 124 keyCombinationForAccelerator:cmd_F]; |
124 NSString* cmd_shift_f_text = [FullscreenExitBubbleController | 125 NSString* cmd_shift_f_text = [FullscreenExitBubbleController |
125 keyCombinationForAccelerator:cmd_shift_f]; | 126 keyCombinationForAccelerator:cmd_shift_f]; |
126 EXPECT_NSEQ(cmd_shift_f_text, cmd_F_text); | 127 EXPECT_NSEQ(cmd_shift_f_text, cmd_F_text); |
127 EXPECT_NSEQ(@"\u2318\u21E7F", cmd_shift_f_text); | 128 EXPECT_NSEQ(@"\u2318\u21E7F", cmd_shift_f_text); |
128 } | 129 } |
OLD | NEW |