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/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/sys_info.h" | 10 #include "base/sys_info.h" |
(...skipping 1679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1690 public: | 1690 public: |
1691 AppModeTest() {} | 1691 AppModeTest() {} |
1692 | 1692 |
1693 virtual void SetUpCommandLine(CommandLine* command_line) { | 1693 virtual void SetUpCommandLine(CommandLine* command_line) { |
1694 GURL url = ui_test_utils::GetTestUrl( | 1694 GURL url = ui_test_utils::GetTestUrl( |
1695 FilePath(), FilePath().AppendASCII("title1.html")); | 1695 FilePath(), FilePath().AppendASCII("title1.html")); |
1696 command_line->AppendSwitchASCII(switches::kApp, url.spec()); | 1696 command_line->AppendSwitchASCII(switches::kApp, url.spec()); |
1697 } | 1697 } |
1698 }; | 1698 }; |
1699 | 1699 |
1700 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { | 1700 // Check failed on Win only. http://crbug.com/163630 |
| 1701 #if defined(OS_WIN) |
| 1702 #define MAYBE_EnableAppModeTest DISABLED_EnableAppModeTest |
| 1703 #else |
| 1704 #define MAYBE_EnableAppModeTest EnableAppModeTest |
| 1705 #endif |
| 1706 |
| 1707 IN_PROC_BROWSER_TEST_F(AppModeTest, MAYBE_EnableAppModeTest) { |
1701 // Test that an application browser window loads correctly. | 1708 // Test that an application browser window loads correctly. |
1702 | 1709 |
1703 // Verify the browser is in application mode. | 1710 // Verify the browser is in application mode. |
1704 EXPECT_TRUE(browser()->is_app()); | 1711 EXPECT_TRUE(browser()->is_app()); |
1705 } | 1712 } |
1706 | 1713 |
1707 // Confirm about:version contains some expected content. | 1714 // Confirm about:version contains some expected content. |
1708 IN_PROC_BROWSER_TEST_F(BrowserTest, AboutVersion) { | 1715 IN_PROC_BROWSER_TEST_F(BrowserTest, AboutVersion) { |
1709 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutVersionURL)); | 1716 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutVersionURL)); |
1710 WebContents* tab = chrome::GetActiveWebContents(browser()); | 1717 WebContents* tab = chrome::GetActiveWebContents(browser()); |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1930 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); | 1937 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); |
1931 } | 1938 } |
1932 | 1939 |
1933 // Shift-middle-clicks open in a foreground tab. | 1940 // Shift-middle-clicks open in a foreground tab. |
1934 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { | 1941 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { |
1935 int modifiers = WebKit::WebInputEvent::ShiftKey; | 1942 int modifiers = WebKit::WebInputEvent::ShiftKey; |
1936 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle; | 1943 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle; |
1937 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; | 1944 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; |
1938 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); | 1945 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); |
1939 } | 1946 } |
OLD | NEW |