From 0d7717faeaef5b72434632c95c78bee4883e2573 Mon Sep 17 00:00:00 2001 From: "dalecurtis@google.com" Date: Tue, 19 Mar 2013 22:06:20 +0000 Subject: Fix OS_MACOS typos. Should be OS_MACOSX. BUG=163208 TEST=none Review URL: https://codereview.chromium.org/12829005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189130 0039d316-1c4b-4281-b951-d872f2087c98 --- .../ui/browser_command_controller_unittest.cc | 25 ++-------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'chrome/browser/ui/browser_command_controller_unittest.cc') diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc index aeaa1df..2953c4d 100644 --- a/chrome/browser/ui/browser_command_controller_unittest.cc +++ b/chrome/browser/ui/browser_command_controller_unittest.cc @@ -255,28 +255,8 @@ TEST_F(BrowserCommandControllerFullscreenTest, chrome::ToggleFullscreenMode(browser()); ASSERT_TRUE(browser()->window()->IsFullscreen()); browser()->command_controller()->FullscreenStateChanged(); -#if defined(OS_MACOS) - // Mac leaves things enabled in fullscreen. - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPEN_CURRENT_URL)); - EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_AS_TAB)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_TOOLBAR)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_LOCATION)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_SEARCH)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_MENU_BAR)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_NEXT_PANE)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_PREVIOUS_PANE)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_BOOKMARKS)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_DEVELOPER_MENU)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FEEDBACK)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_EDIT_SEARCH_ENGINES)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_VIEW_PASSWORDS)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ABOUT)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_SHOW_APP_MENU)); - EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN)); -#else - // Windows and GTK disable most commands in fullscreen. + + // Most commands are disabled in fullscreen. EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_OPEN_CURRENT_URL)); EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_AS_TAB)); EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_TOOLBAR)); @@ -295,7 +275,6 @@ TEST_F(BrowserCommandControllerFullscreenTest, EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ABOUT)); EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_APP_MENU)); EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN)); -#endif // defined(OS_MACOS) // Exit fullscreen. chrome::ToggleFullscreenMode(browser()); -- cgit v1.1