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 #include <string> | 5 #include <string> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1662 #if !defined(TOOLKIT_GTK) && !defined(OS_MACOSX) && \ | 1662 #if !defined(TOOLKIT_GTK) && !defined(OS_MACOSX) && \ |
1663 !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)) | 1663 !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)) |
1664 IN_PROC_BROWSER_TEST_F(BrowserTest, FullscreenBookmarkBar) { | 1664 IN_PROC_BROWSER_TEST_F(BrowserTest, FullscreenBookmarkBar) { |
1665 chrome::ToggleBookmarkBar(browser()); | 1665 chrome::ToggleBookmarkBar(browser()); |
1666 EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state()); | 1666 EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state()); |
1667 chrome::ToggleFullscreenMode(browser()); | 1667 chrome::ToggleFullscreenMode(browser()); |
1668 EXPECT_TRUE(browser()->window()->IsFullscreen()); | 1668 EXPECT_TRUE(browser()->window()->IsFullscreen()); |
1669 #if defined(OS_MACOSX) | 1669 #if defined(OS_MACOSX) |
1670 EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state()); | 1670 EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state()); |
1671 #elif defined(OS_CHROMEOS) | 1671 #elif defined(OS_CHROMEOS) |
1672 // TODO(jamescook): When immersive fullscreen is enabled by default, test | 1672 // TODO(jamescook): If immersive fullscreen is disabled by default, test |
1673 // for BookmarkBar::SHOW. | 1673 // for BookmarkBar::HIDDEN. |
1674 EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state()); | 1674 EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state()); |
1675 #else | 1675 #else |
1676 EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state()); | 1676 EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state()); |
1677 #endif | 1677 #endif |
1678 } | 1678 } |
1679 #endif | 1679 #endif |
1680 | 1680 |
1681 class ShowModalDialogTest : public BrowserTest { | 1681 class ShowModalDialogTest : public BrowserTest { |
1682 public: | 1682 public: |
1683 ShowModalDialogTest() {} | 1683 ShowModalDialogTest() {} |
1684 | 1684 |
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2099 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); | 2099 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); |
2100 } | 2100 } |
2101 | 2101 |
2102 // Shift-middle-clicks open in a foreground tab. | 2102 // Shift-middle-clicks open in a foreground tab. |
2103 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { | 2103 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { |
2104 int modifiers = WebKit::WebInputEvent::ShiftKey; | 2104 int modifiers = WebKit::WebInputEvent::ShiftKey; |
2105 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle; | 2105 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle; |
2106 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; | 2106 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; |
2107 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); | 2107 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); |
2108 } | 2108 } |
OLD | NEW |