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/message_loop.h" | 5 #include "base/message_loop.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 that the panel stays as docked. | 1247 // Expect that the panel stays as docked. |
1248 panel_testing->CancelDragTitlebar(); | 1248 panel_testing->CancelDragTitlebar(); |
1249 ASSERT_EQ(1, docked_collection->num_panels()); | 1249 ASSERT_EQ(1, docked_collection->num_panels()); |
1250 ASSERT_EQ(0, detached_collection->num_panels()); | 1250 ASSERT_EQ(0, detached_collection->num_panels()); |
1251 EXPECT_EQ(PanelCollection::DOCKED, panel->collection()->type()); | 1251 EXPECT_EQ(PanelCollection::DOCKED, panel->collection()->type()); |
1252 EXPECT_EQ(panel_old_bounds, panel->GetBounds()); | 1252 EXPECT_EQ(panel_old_bounds, panel->GetBounds()); |
1253 | 1253 |
1254 panel_manager->CloseAll(); | 1254 panel_manager->CloseAll(); |
1255 } | 1255 } |
1256 | 1256 |
1257 // Disabled on GTK in metacity: http://crbug.com/167114 | 1257 IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachWithSqueeze) { |
1258 #if defined(TOOLKIT_GTK) | |
1259 #define MAYBE_DetachWithSqueeze DISABLED_DetachWithSqueeze | |
1260 #else | |
1261 #define MAYBE_DetachWithSqueeze DetachWithSqueeze | |
1262 #endif | |
1263 IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, MAYBE_DetachWithSqueeze) { | |
1264 PanelManager* panel_manager = PanelManager::GetInstance(); | 1258 PanelManager* panel_manager = PanelManager::GetInstance(); |
1265 DockedPanelCollection* docked_collection = panel_manager->docked_collection(); | 1259 DockedPanelCollection* docked_collection = panel_manager->docked_collection(); |
1266 DetachedPanelCollection* detached_collection = | 1260 DetachedPanelCollection* detached_collection = |
1267 panel_manager->detached_collection(); | 1261 panel_manager->detached_collection(); |
1268 | 1262 |
1269 gfx::Vector2d drag_delta_to_detach = GetDragDeltaToDetach(); | 1263 gfx::Vector2d drag_delta_to_detach = GetDragDeltaToDetach(); |
1270 | 1264 |
1271 // Create some docked panels. | 1265 // Create some docked panels. |
1272 // docked: P1 P2 P3 P4 P5 | 1266 // docked: P1 P2 P3 P4 P5 |
1273 Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100)); | 1267 Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100)); |
(...skipping 1652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2926 panel1->GetBounds().height() - panel2->GetBounds().height()); | 2920 panel1->GetBounds().height() - panel2->GetBounds().height()); |
2927 EXPECT_EQ(panel1_expected_bounds, panel1->GetBounds()); | 2921 EXPECT_EQ(panel1_expected_bounds, panel1->GetBounds()); |
2928 panel2_expected_bounds.set_x(expected_x); | 2922 panel2_expected_bounds.set_x(expected_x); |
2929 panel2_expected_bounds.set_y(display_area.bottom() - | 2923 panel2_expected_bounds.set_y(display_area.bottom() - |
2930 panel2->GetBounds().height()); | 2924 panel2->GetBounds().height()); |
2931 EXPECT_EQ(panel2_expected_bounds, panel2->GetBounds()); | 2925 EXPECT_EQ(panel2_expected_bounds, panel2->GetBounds()); |
2932 | 2926 |
2933 panel_manager->CloseAll(); | 2927 panel_manager->CloseAll(); |
2934 } | 2928 } |
2935 #endif | 2929 #endif |
OLD | NEW |