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