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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 | 250 |
251 // The below could be separate tests, just adding a TODO here for tracking. | 251 // The below could be separate tests, just adding a TODO here for tracking. |
252 // TODO(prasadt): Add test for dragging when in titlebar exposed state. | 252 // TODO(prasadt): Add test for dragging when in titlebar exposed state. |
253 // TODO(prasadt): Add test in presence of auto hiding task bar. | 253 // TODO(prasadt): Add test in presence of auto hiding task bar. |
254 | 254 |
255 for (size_t i = 0; i < panels.size(); ++i) | 255 for (size_t i = 0; i < panels.size(); ++i) |
256 delete native_panels_testing[i]; | 256 delete native_panels_testing[i]; |
257 } | 257 } |
258 }; | 258 }; |
259 | 259 |
260 IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, CheckDockedPanelProperties) { | 260 // http://crbug.com/141013 |
| 261 #if defined(OS_WIN) |
| 262 #define MAYBE_CheckDockedPanelProperties DISABLED_CheckDockedPanelProperties |
| 263 #else |
| 264 #define MAYBE_CheckDockedPanelProperties CheckDockedPanelProperties |
| 265 #endif |
| 266 IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MAYBE_CheckDockedPanelProperties) { |
261 PanelManager* panel_manager = PanelManager::GetInstance(); | 267 PanelManager* panel_manager = PanelManager::GetInstance(); |
262 DockedPanelStrip* docked_strip = panel_manager->docked_strip(); | 268 DockedPanelStrip* docked_strip = panel_manager->docked_strip(); |
263 | 269 |
264 // Create 3 docked panels that are in expanded, title-only or minimized states | 270 // Create 3 docked panels that are in expanded, title-only or minimized states |
265 // respectively. | 271 // respectively. |
266 Panel* panel1 = CreatePanelWithBounds("1", gfx::Rect(0, 0, 100, 100)); | 272 Panel* panel1 = CreatePanelWithBounds("1", gfx::Rect(0, 0, 100, 100)); |
267 Panel* panel2 = CreatePanelWithBounds("2", gfx::Rect(0, 0, 100, 100)); | 273 Panel* panel2 = CreatePanelWithBounds("2", gfx::Rect(0, 0, 100, 100)); |
268 panel2->SetExpansionState(Panel::TITLE_ONLY); | 274 panel2->SetExpansionState(Panel::TITLE_ONLY); |
269 WaitForExpansionStateChanged(panel2, Panel::TITLE_ONLY); | 275 WaitForExpansionStateChanged(panel2, Panel::TITLE_ONLY); |
270 Panel* panel3 = CreatePanelWithBounds("3", gfx::Rect(0, 0, 100, 100)); | 276 Panel* panel3 = CreatePanelWithBounds("3", gfx::Rect(0, 0, 100, 100)); |
(...skipping 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1526 EXPECT_GE(smaller_work_area_size.width(), panel->max_size().width()); | 1532 EXPECT_GE(smaller_work_area_size.width(), panel->max_size().width()); |
1527 EXPECT_EQ(smaller_work_area_size.height(), panel->max_size().height()); | 1533 EXPECT_EQ(smaller_work_area_size.height(), panel->max_size().height()); |
1528 EXPECT_GT(old_full_size.width(), panel->full_size().width()); | 1534 EXPECT_GT(old_full_size.width(), panel->full_size().width()); |
1529 EXPECT_GT(old_full_size.height(), panel->full_size().height()); | 1535 EXPECT_GT(old_full_size.height(), panel->full_size().height()); |
1530 EXPECT_GE(panel->max_size().width(), panel->full_size().width()); | 1536 EXPECT_GE(panel->max_size().width(), panel->full_size().width()); |
1531 EXPECT_GE(panel->max_size().height(), panel->full_size().height()); | 1537 EXPECT_GE(panel->max_size().height(), panel->full_size().height()); |
1532 EXPECT_EQ(smaller_work_area_size.height(), panel->full_size().height()); | 1538 EXPECT_EQ(smaller_work_area_size.height(), panel->full_size().height()); |
1533 | 1539 |
1534 panel->Close(); | 1540 panel->Close(); |
1535 } | 1541 } |
OLD | NEW |