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/browser/download/download_service.h" | 7 #include "chrome/browser/download/download_service.h" |
8 #include "chrome/browser/download/download_service_factory.h" | 8 #include "chrome/browser/download/download_service_factory.h" |
9 #include "chrome/browser/net/url_request_mock_util.h" | 9 #include "chrome/browser/net/url_request_mock_util.h" |
10 #include "chrome/browser/prefs/browser_prefs.h" | 10 #include "chrome/browser/prefs/browser_prefs.h" |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 | 253 |
254 // The below could be separate tests, just adding a TODO here for tracking. | 254 // The below could be separate tests, just adding a TODO here for tracking. |
255 // TODO(prasadt): Add test for dragging when in titlebar exposed state. | 255 // TODO(prasadt): Add test for dragging when in titlebar exposed state. |
256 // TODO(prasadt): Add test in presence of auto hiding task bar. | 256 // TODO(prasadt): Add test in presence of auto hiding task bar. |
257 | 257 |
258 for (size_t i = 0; i < panels.size(); ++i) | 258 for (size_t i = 0; i < panels.size(); ++i) |
259 delete native_panels_testing[i]; | 259 delete native_panels_testing[i]; |
260 } | 260 } |
261 }; | 261 }; |
262 | 262 |
263 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CheckDockedPanelProperties) { | 263 // Flaky (sometimes timeout): http://crbug.com/140971 |
| 264 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_CheckDockedPanelProperties) { |
264 PanelManager* panel_manager = PanelManager::GetInstance(); | 265 PanelManager* panel_manager = PanelManager::GetInstance(); |
265 DockedPanelStrip* docked_strip = panel_manager->docked_strip(); | 266 DockedPanelStrip* docked_strip = panel_manager->docked_strip(); |
266 | 267 |
267 // Don't let actual mouse movements affect this test as that may affect | 268 // Don't let actual mouse movements affect this test as that may affect |
268 // minimized vs title-only state. | 269 // minimized vs title-only state. |
269 PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher(); | 270 PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher(); |
270 panel_manager->SetMouseWatcherForTesting(mouse_watcher); | 271 panel_manager->SetMouseWatcherForTesting(mouse_watcher); |
271 | 272 |
272 // Create 3 docked panels that are in expanded, title-only or minimized states | 273 // Create 3 docked panels that are in expanded, title-only or minimized states |
273 // respectively. | 274 // respectively. |
(...skipping 1298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1572 EXPECT_GT(old_full_size.width(), panel->full_size().width()); | 1573 EXPECT_GT(old_full_size.width(), panel->full_size().width()); |
1573 EXPECT_GT(old_full_size.height(), panel->full_size().height()); | 1574 EXPECT_GT(old_full_size.height(), panel->full_size().height()); |
1574 EXPECT_GE(panel->max_size().width(), panel->full_size().width()); | 1575 EXPECT_GE(panel->max_size().width(), panel->full_size().width()); |
1575 EXPECT_GE(panel->max_size().height(), panel->full_size().height()); | 1576 EXPECT_GE(panel->max_size().height(), panel->full_size().height()); |
1576 EXPECT_EQ(smaller_work_area_size.height(), panel->full_size().height()); | 1577 EXPECT_EQ(smaller_work_area_size.height(), panel->full_size().height()); |
1577 | 1578 |
1578 panel->Close(); | 1579 panel->Close(); |
1579 } | 1580 } |
1580 | 1581 |
1581 #endif // OS_WIN || OS_MACOSX | 1582 #endif // OS_WIN || OS_MACOSX |
OLD | NEW |