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

Side by Side Diff: chrome/browser/ui/cocoa/panels/panel_cocoa_unittest.mm

Issue 1886463003: Remove the Presentation Mode Command ID (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed some 10.6 logic Created 4 years, 8 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
« no previous file with comments | « chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/panels/panel_cocoa.h" 5 #import "chrome/browser/ui/cocoa/panels/panel_cocoa.h"
6 6
7 #include <Carbon/Carbon.h> 7 #include <Carbon/Carbon.h>
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 NSMenuItem* close_tab_menu_item = CreateMenuItem(menu, IDC_CLOSE_TAB); 301 NSMenuItem* close_tab_menu_item = CreateMenuItem(menu, IDC_CLOSE_TAB);
302 NSMenuItem* new_tab_menu_item = CreateMenuItem(menu, IDC_NEW_TAB); 302 NSMenuItem* new_tab_menu_item = CreateMenuItem(menu, IDC_NEW_TAB);
303 NSMenuItem* new_tab_window_item = CreateMenuItem(menu, IDC_NEW_WINDOW); 303 NSMenuItem* new_tab_window_item = CreateMenuItem(menu, IDC_NEW_WINDOW);
304 NSMenuItem* new_tab_incognito_window_item = 304 NSMenuItem* new_tab_incognito_window_item =
305 CreateMenuItem(menu, IDC_NEW_INCOGNITO_WINDOW); 305 CreateMenuItem(menu, IDC_NEW_INCOGNITO_WINDOW);
306 NSMenuItem* close_window_menu_item = CreateMenuItem(menu, IDC_CLOSE_WINDOW); 306 NSMenuItem* close_window_menu_item = CreateMenuItem(menu, IDC_CLOSE_WINDOW);
307 NSMenuItem* find_menu_item = CreateMenuItem(menu, IDC_FIND); 307 NSMenuItem* find_menu_item = CreateMenuItem(menu, IDC_FIND);
308 NSMenuItem* find_previous_menu_item = CreateMenuItem(menu, IDC_FIND_PREVIOUS); 308 NSMenuItem* find_previous_menu_item = CreateMenuItem(menu, IDC_FIND_PREVIOUS);
309 NSMenuItem* find_next_menu_item = CreateMenuItem(menu, IDC_FIND_NEXT); 309 NSMenuItem* find_next_menu_item = CreateMenuItem(menu, IDC_FIND_NEXT);
310 NSMenuItem* fullscreen_menu_item = CreateMenuItem(menu, IDC_FULLSCREEN); 310 NSMenuItem* fullscreen_menu_item = CreateMenuItem(menu, IDC_FULLSCREEN);
311 NSMenuItem* presentation_menu_item =
312 CreateMenuItem(menu, IDC_PRESENTATION_MODE);
313 NSMenuItem* sync_menu_item = CreateMenuItem(menu, IDC_SHOW_SYNC_SETUP); 311 NSMenuItem* sync_menu_item = CreateMenuItem(menu, IDC_SHOW_SYNC_SETUP);
314 NSMenuItem* dev_tools_item = CreateMenuItem(menu, IDC_DEV_TOOLS); 312 NSMenuItem* dev_tools_item = CreateMenuItem(menu, IDC_DEV_TOOLS);
315 NSMenuItem* dev_tools_console_item = 313 NSMenuItem* dev_tools_console_item =
316 CreateMenuItem(menu, IDC_DEV_TOOLS_CONSOLE); 314 CreateMenuItem(menu, IDC_DEV_TOOLS_CONSOLE);
317 315
318 PanelCocoa* native_window = static_cast<PanelCocoa*>(panel->native_panel()); 316 PanelCocoa* native_window = static_cast<PanelCocoa*>(panel->native_panel());
319 PanelWindowControllerCocoa* panel_controller = native_window->controller_; 317 PanelWindowControllerCocoa* panel_controller = native_window->controller_;
320 for (NSMenuItem *item in [menu itemArray]) 318 for (NSMenuItem *item in [menu itemArray])
321 [item setTarget:panel_controller]; 319 [item setTarget:panel_controller];
322 320
323 [menu update]; // Trigger validation of menu items. 321 [menu update]; // Trigger validation of menu items.
324 EXPECT_FALSE([close_tab_menu_item isEnabled]); 322 EXPECT_FALSE([close_tab_menu_item isEnabled]);
325 EXPECT_TRUE([close_window_menu_item isEnabled]); 323 EXPECT_TRUE([close_window_menu_item isEnabled]);
326 // No find support. Panels don't have a find bar. 324 // No find support. Panels don't have a find bar.
327 EXPECT_FALSE([find_menu_item isEnabled]); 325 EXPECT_FALSE([find_menu_item isEnabled]);
328 EXPECT_FALSE([find_previous_menu_item isEnabled]); 326 EXPECT_FALSE([find_previous_menu_item isEnabled]);
329 EXPECT_FALSE([find_next_menu_item isEnabled]); 327 EXPECT_FALSE([find_next_menu_item isEnabled]);
330 EXPECT_FALSE([fullscreen_menu_item isEnabled]); 328 EXPECT_FALSE([fullscreen_menu_item isEnabled]);
331 EXPECT_FALSE([presentation_menu_item isEnabled]);
332 EXPECT_FALSE([sync_menu_item isEnabled]); 329 EXPECT_FALSE([sync_menu_item isEnabled]);
333 // These are not enabled by Panel, so they are expected to be disabled for 330 // These are not enabled by Panel, so they are expected to be disabled for
334 // this unit_test. In real Chrome app, they are enabled by Chrome NSApp 331 // this unit_test. In real Chrome app, they are enabled by Chrome NSApp
335 // controller. PanelCocoaBrowsertest.MenuItems verifies that. 332 // controller. PanelCocoaBrowsertest.MenuItems verifies that.
336 EXPECT_FALSE([new_tab_menu_item isEnabled]); 333 EXPECT_FALSE([new_tab_menu_item isEnabled]);
337 EXPECT_FALSE([new_tab_window_item isEnabled]); 334 EXPECT_FALSE([new_tab_window_item isEnabled]);
338 EXPECT_FALSE([new_tab_incognito_window_item isEnabled]); 335 EXPECT_FALSE([new_tab_incognito_window_item isEnabled]);
339 336
340 EXPECT_TRUE([dev_tools_item isEnabled]); 337 EXPECT_TRUE([dev_tools_item isEnabled]);
341 EXPECT_TRUE([dev_tools_console_item isEnabled]); 338 EXPECT_TRUE([dev_tools_console_item isEnabled]);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]); 400 EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]);
404 401
405 native_window2->ActivatePanel(); 402 native_window2->ActivatePanel();
406 chrome::testing::NSRunLoopRunAllPending(); 403 chrome::testing::NSRunLoopRunAllPending();
407 frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; 404 frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0];
408 EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]); 405 EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]);
409 406
410 ClosePanelAndWait(panel); 407 ClosePanelAndWait(panel);
411 ClosePanelAndWait(panel2); 408 ClosePanelAndWait(panel2);
412 } 409 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698