| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 #include "chrome/browser/ui/panels/base_panel_browser_test.h" | 6 #include "chrome/browser/ui/panels/base_panel_browser_test.h" |
| 7 #include "chrome/browser/ui/panels/detached_panel_collection.h" | 7 #include "chrome/browser/ui/panels/detached_panel_collection.h" |
| 8 #include "chrome/browser/ui/panels/docked_panel_collection.h" | 8 #include "chrome/browser/ui/panels/docked_panel_collection.h" |
| 9 #include "chrome/browser/ui/panels/native_panel.h" | 9 #include "chrome/browser/ui/panels/native_panel.h" |
| 10 #include "chrome/browser/ui/panels/panel.h" | 10 #include "chrome/browser/ui/panels/panel.h" |
| (...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1247 EXPECT_EQ(PanelCollection::DETACHED, panel3->collection()->type()); | 1247 EXPECT_EQ(PanelCollection::DETACHED, panel3->collection()->type()); |
| 1248 | 1248 |
| 1249 panel3_expected_bounds.set_y(panel2_expected_bounds.y()); | 1249 panel3_expected_bounds.set_y(panel2_expected_bounds.y()); |
| 1250 EXPECT_EQ(panel3_expected_bounds, panel3->GetBounds()); | 1250 EXPECT_EQ(panel3_expected_bounds, panel3->GetBounds()); |
| 1251 | 1251 |
| 1252 panel_manager->CloseAll(); | 1252 panel_manager->CloseAll(); |
| 1253 } | 1253 } |
| 1254 | 1254 |
| 1255 // Skip the test since active state might not be fully supported for some window | 1255 // Skip the test since active state might not be fully supported for some window |
| 1256 // managers. | 1256 // managers. |
| 1257 #if defined(TOOLKIT_GTK) | 1257 #if defined(TOOLKIT_GTK) || defined(OS_MACOSX) |
| 1258 #define MAYBE_FocusNextPanelOnPanelClose DISABLED_FocusNextPanelOnPanelClose | 1258 #define MAYBE_FocusNextPanelOnPanelClose DISABLED_FocusNextPanelOnPanelClose |
| 1259 #else | 1259 #else |
| 1260 #define MAYBE_FocusNextPanelOnPanelClose FocusNextPanelOnPanelClose | 1260 #define MAYBE_FocusNextPanelOnPanelClose FocusNextPanelOnPanelClose |
| 1261 #endif | 1261 #endif |
| 1262 IN_PROC_BROWSER_TEST_F(StackedPanelBrowserTest, | 1262 IN_PROC_BROWSER_TEST_F(StackedPanelBrowserTest, |
| 1263 MAYBE_FocusNextPanelOnPanelClose) { | 1263 MAYBE_FocusNextPanelOnPanelClose) { |
| 1264 PanelManager* panel_manager = PanelManager::GetInstance(); | 1264 PanelManager* panel_manager = PanelManager::GetInstance(); |
| 1265 | 1265 |
| 1266 // Create 3 stacked panels. | 1266 // Create 3 stacked panels. |
| 1267 StackedPanelCollection* stack = panel_manager->CreateStack(); | 1267 StackedPanelCollection* stack = panel_manager->CreateStack(); |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1446 EXPECT_EQ(bounds3.bottom(), bounds4.y()); | 1446 EXPECT_EQ(bounds3.bottom(), bounds4.y()); |
| 1447 | 1447 |
| 1448 gfx::Rect bounds5 = panel5->GetBounds(); | 1448 gfx::Rect bounds5 = panel5->GetBounds(); |
| 1449 EXPECT_EQ(bounds4.x(), bounds5.x()); | 1449 EXPECT_EQ(bounds4.x(), bounds5.x()); |
| 1450 EXPECT_EQ(bounds4.width(), bounds5.width()); | 1450 EXPECT_EQ(bounds4.width(), bounds5.width()); |
| 1451 EXPECT_EQ(bounds4.bottom(), bounds5.y()); | 1451 EXPECT_EQ(bounds4.bottom(), bounds5.y()); |
| 1452 EXPECT_LE(bounds5.bottom(), primary_work_area.bottom()); | 1452 EXPECT_LE(bounds5.bottom(), primary_work_area.bottom()); |
| 1453 | 1453 |
| 1454 panel_manager->CloseAll(); | 1454 panel_manager->CloseAll(); |
| 1455 } | 1455 } |
| OLD | NEW |