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/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/browser_tabstrip.h" | 9 #include "chrome/browser/ui/browser_tabstrip.h" |
10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 TabContents* tab_contents = chrome::TabContentsFactory( | 69 TabContents* tab_contents = chrome::TabContentsFactory( |
70 profile(), site_instance_, MSG_ROUTING_NONE, NULL); | 70 profile(), site_instance_, MSG_ROUTING_NONE, NULL); |
71 browser()->tab_strip_model()->AppendTabContents( | 71 browser()->tab_strip_model()->AppendTabContents( |
72 tab_contents, /*foreground=*/true); | 72 tab_contents, /*foreground=*/true); |
73 } | 73 } |
74 | 74 |
75 scoped_refptr<SiteInstance> site_instance_; | 75 scoped_refptr<SiteInstance> site_instance_; |
76 scoped_nsobject<FullscreenExitBubbleController> controller_; | 76 scoped_nsobject<FullscreenExitBubbleController> controller_; |
77 }; | 77 }; |
78 | 78 |
79 TEST_F(FullscreenExitBubbleControllerTest, DenyExitsFullscreen) { | 79 // http://crbug.com/103912 |
| 80 TEST_F(FullscreenExitBubbleControllerTest, DISABLED_DenyExitsFullscreen) { |
80 NSWindow* window = browser()->window()->GetNativeWindow(); | 81 NSWindow* window = browser()->window()->GetNativeWindow(); |
81 BrowserWindowController* bwc = [BrowserWindowController | 82 BrowserWindowController* bwc = [BrowserWindowController |
82 browserWindowControllerForWindow:window]; | 83 browserWindowControllerForWindow:window]; |
83 | 84 |
84 [bwc showWindow:nil]; | 85 [bwc showWindow:nil]; |
85 | 86 |
86 AppendTabToStrip(); | 87 AppendTabToStrip(); |
87 WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser()); | 88 WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser()); |
88 { | 89 { |
89 base::mac::ScopedNSAutoreleasePool pool; | 90 base::mac::ScopedNSAutoreleasePool pool; |
(...skipping 27 matching lines...) Expand all Loading... |
117 TEST_F(FullscreenExitBubbleControllerTest, ShortcutText) { | 118 TEST_F(FullscreenExitBubbleControllerTest, ShortcutText) { |
118 ui::AcceleratorCocoa cmd_F(@"F", NSCommandKeyMask); | 119 ui::AcceleratorCocoa cmd_F(@"F", NSCommandKeyMask); |
119 ui::AcceleratorCocoa cmd_shift_f(@"f", NSCommandKeyMask|NSShiftKeyMask); | 120 ui::AcceleratorCocoa cmd_shift_f(@"f", NSCommandKeyMask|NSShiftKeyMask); |
120 NSString* cmd_F_text = [FullscreenExitBubbleController | 121 NSString* cmd_F_text = [FullscreenExitBubbleController |
121 keyCombinationForAccelerator:cmd_F]; | 122 keyCombinationForAccelerator:cmd_F]; |
122 NSString* cmd_shift_f_text = [FullscreenExitBubbleController | 123 NSString* cmd_shift_f_text = [FullscreenExitBubbleController |
123 keyCombinationForAccelerator:cmd_shift_f]; | 124 keyCombinationForAccelerator:cmd_shift_f]; |
124 EXPECT_NSEQ(cmd_shift_f_text, cmd_F_text); | 125 EXPECT_NSEQ(cmd_shift_f_text, cmd_F_text); |
125 EXPECT_NSEQ(@"\u2318\u21E7F", cmd_shift_f_text); | 126 EXPECT_NSEQ(@"\u2318\u21E7F", cmd_shift_f_text); |
126 } | 127 } |
OLD | NEW |