| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 2703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2714 // Shift-middle-clicks open in a foreground tab. | 2714 // Shift-middle-clicks open in a foreground tab. |
| 2715 // http://crbug.com/396347 | 2715 // http://crbug.com/396347 |
| 2716 IN_PROC_BROWSER_TEST_F(ClickModifierTest, DISABLED_HrefShiftMiddleClickTest) { | 2716 IN_PROC_BROWSER_TEST_F(ClickModifierTest, DISABLED_HrefShiftMiddleClickTest) { |
| 2717 int modifiers = blink::WebInputEvent::ShiftKey; | 2717 int modifiers = blink::WebInputEvent::ShiftKey; |
| 2718 blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonMiddle; | 2718 blink::WebMouseEvent::Button button = blink::WebMouseEvent::ButtonMiddle; |
| 2719 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; | 2719 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; |
| 2720 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); | 2720 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); |
| 2721 } | 2721 } |
| 2722 | 2722 |
| 2723 IN_PROC_BROWSER_TEST_F(BrowserTest, GetSizeForNewRenderView) { | 2723 IN_PROC_BROWSER_TEST_F(BrowserTest, GetSizeForNewRenderView) { |
| 2724 #if defined(OS_MACOSX) | |
| 2725 // TODO(erikchen): This behavior has regressed on OSX 10.7 and 10.8 and should | |
| 2726 // be fixed. http://crbug.com/503185 | |
| 2727 if (base::mac::IsOSMountainLion() || base::mac::IsOSLion()) | |
| 2728 return; | |
| 2729 #endif // defined(OS_MACOSX) | |
| 2730 // The instant extended NTP has javascript that does not work with | 2724 // The instant extended NTP has javascript that does not work with |
| 2731 // ui_test_utils::NavigateToURL. The NTP rvh reloads when the browser tries | 2725 // ui_test_utils::NavigateToURL. The NTP rvh reloads when the browser tries |
| 2732 // to navigate away from the page, which causes the WebContents to end up in | 2726 // to navigate away from the page, which causes the WebContents to end up in |
| 2733 // an inconsistent state. (is_loaded = true, last_commited_url=ntp, | 2727 // an inconsistent state. (is_loaded = true, last_commited_url=ntp, |
| 2734 // visible_url=title1.html) | 2728 // visible_url=title1.html) |
| 2735 browser()->profile()->GetPrefs()->SetBoolean(prefs::kWebKitJavascriptEnabled, | 2729 browser()->profile()->GetPrefs()->SetBoolean(prefs::kWebKitJavascriptEnabled, |
| 2736 false); | 2730 false); |
| 2737 ASSERT_TRUE(embedded_test_server()->Start()); | 2731 ASSERT_TRUE(embedded_test_server()->Start()); |
| 2738 // Create an HTTPS server for cross-site transition. | 2732 // Create an HTTPS server for cross-site transition. |
| 2739 net::EmbeddedTestServer https_test_server( | 2733 net::EmbeddedTestServer https_test_server( |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3277 Browser* browser = new Browser(params); | 3271 Browser* browser = new Browser(params); |
| 3278 gfx::Rect bounds = browser->window()->GetBounds(); | 3272 gfx::Rect bounds = browser->window()->GetBounds(); |
| 3279 | 3273 |
| 3280 // Should be EXPECT_EQ, but this width is inconsistent across platforms. | 3274 // Should be EXPECT_EQ, but this width is inconsistent across platforms. |
| 3281 // See https://crbug.com/567925. | 3275 // See https://crbug.com/567925. |
| 3282 EXPECT_GE(bounds.width(), 100); | 3276 EXPECT_GE(bounds.width(), 100); |
| 3283 EXPECT_EQ(122, bounds.height()); | 3277 EXPECT_EQ(122, bounds.height()); |
| 3284 browser->window()->Close(); | 3278 browser->window()->Close(); |
| 3285 } | 3279 } |
| 3286 } | 3280 } |
| OLD | NEW |