| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/browser/devtools/devtools_window.h" | 8 #include "chrome/browser/devtools/devtools_window.h" |
| 9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
| 10 #include "chrome/browser/net/url_request_mock_util.h" | 10 #include "chrome/browser/net/url_request_mock_util.h" |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 | 394 |
| 395 protected: | 395 protected: |
| 396 virtual bool AtExpectedState() OVERRIDE { | 396 virtual bool AtExpectedState() OVERRIDE { |
| 397 return panel_->GetBounds().width() < initial_size_.width(); | 397 return panel_->GetBounds().width() < initial_size_.width(); |
| 398 } | 398 } |
| 399 Panel* panel_; | 399 Panel* panel_; |
| 400 gfx::Size initial_size_; | 400 gfx::Size initial_size_; |
| 401 }; | 401 }; |
| 402 | 402 |
| 403 // crbug.com/160504 | 403 // crbug.com/160504 |
| 404 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, FLAKY_AutoResize) { | 404 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_AutoResize) { |
| 405 PanelManager* panel_manager = PanelManager::GetInstance(); | 405 PanelManager* panel_manager = PanelManager::GetInstance(); |
| 406 panel_manager->enable_auto_sizing(true); | 406 panel_manager->enable_auto_sizing(true); |
| 407 // Bigger space is needed by this test. | 407 // Bigger space is needed by this test. |
| 408 SetTestingAreas(gfx::Rect(0, 0, 1200, 900), gfx::Rect()); | 408 SetTestingAreas(gfx::Rect(0, 0, 1200, 900), gfx::Rect()); |
| 409 | 409 |
| 410 // Create a test panel with web contents loaded. | 410 // Create a test panel with web contents loaded. |
| 411 CreatePanelParams params("PanelTest1", gfx::Rect(), SHOW_AS_ACTIVE); | 411 CreatePanelParams params("PanelTest1", gfx::Rect(), SHOW_AS_ACTIVE); |
| 412 GURL url(ui_test_utils::GetTestUrl( | 412 GURL url(ui_test_utils::GetTestUrl( |
| 413 FilePath(kTestDir), | 413 FilePath(kTestDir), |
| 414 FilePath(FILE_PATH_LITERAL("update-preferred-size.html")))); | 414 FilePath(FILE_PATH_LITERAL("update-preferred-size.html")))); |
| (...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1758 #else | 1758 #else |
| 1759 #define MAYBE_FocusChangeEventOnMinimize FocusChangeEventOnMinimize | 1759 #define MAYBE_FocusChangeEventOnMinimize FocusChangeEventOnMinimize |
| 1760 #endif | 1760 #endif |
| 1761 IN_PROC_BROWSER_TEST_F(PanelExtensionApiTest, | 1761 IN_PROC_BROWSER_TEST_F(PanelExtensionApiTest, |
| 1762 MAYBE_FocusChangeEventOnMinimize) { | 1762 MAYBE_FocusChangeEventOnMinimize) { |
| 1763 // This is needed so the subsequently created panels can be activated. | 1763 // This is needed so the subsequently created panels can be activated. |
| 1764 // On a Mac, it transforms background-only test process into foreground one. | 1764 // On a Mac, it transforms background-only test process into foreground one. |
| 1765 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 1765 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
| 1766 ASSERT_TRUE(RunExtensionTest("panels/focus_change_on_minimize")) << message_; | 1766 ASSERT_TRUE(RunExtensionTest("panels/focus_change_on_minimize")) << message_; |
| 1767 } | 1767 } |
| OLD | NEW |