| 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 <vector> | 5 #include <vector> |
| 6 #include "chrome/browser/ui/browser.h" | 6 #include "chrome/browser/ui/browser.h" |
| 7 #include "chrome/browser/ui/panels/base_panel_browser_test.h" | 7 #include "chrome/browser/ui/panels/base_panel_browser_test.h" |
| 8 #include "chrome/browser/ui/panels/docked_panel_strip.h" | 8 #include "chrome/browser/ui/panels/docked_panel_strip.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/overflow_panel_strip.h" | 10 #include "chrome/browser/ui/panels/overflow_panel_strip.h" |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 EXPECT_FALSE(panel4->has_temporary_layout()); | 247 EXPECT_FALSE(panel4->has_temporary_layout()); |
| 248 EXPECT_FALSE(panel4->draggable()); | 248 EXPECT_FALSE(panel4->draggable()); |
| 249 | 249 |
| 250 PanelManager::GetInstance()->CloseAll(); | 250 PanelManager::GetInstance()->CloseAll(); |
| 251 } | 251 } |
| 252 | 252 |
| 253 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, UpdateDraggableStatus) { | 253 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, UpdateDraggableStatus) { |
| 254 PanelManager* panel_manager = PanelManager::GetInstance(); | 254 PanelManager* panel_manager = PanelManager::GetInstance(); |
| 255 Panel* panel = CreatePanel("panel"); | 255 Panel* panel = CreatePanel("panel"); |
| 256 EXPECT_TRUE(panel->draggable()); | 256 EXPECT_TRUE(panel->draggable()); |
| 257 panel->MoveToStrip(panel_manager->overflow_strip()); | 257 panel_manager->MovePanelToStrip(panel, PanelStrip::IN_OVERFLOW); |
| 258 EXPECT_FALSE(panel->draggable()); | 258 EXPECT_FALSE(panel->draggable()); |
| 259 panel->MoveToStrip(panel_manager->docked_strip()); | 259 panel_manager->MovePanelToStrip(panel, PanelStrip::DOCKED); |
| 260 EXPECT_TRUE(panel->draggable()); | 260 EXPECT_TRUE(panel->draggable()); |
| 261 panel->Close(); | 261 panel->Close(); |
| 262 } | 262 } |
| 263 | 263 |
| 264 // http://crbug.com/115619 | 264 // http://crbug.com/115619 |
| 265 #if defined(OS_WIN) || defined(OS_MACOSX) | 265 #if defined(OS_WIN) || defined(OS_MACOSX) |
| 266 #define MAYBE_CreateOverflowPanels CreateOverflowPanels | 266 #define MAYBE_CreateOverflowPanels CreateOverflowPanels |
| 267 #else | 267 #else |
| 268 #define MAYBE_CreateOverflowPanels DISABLED_CreateOverflowPanels | 268 #define MAYBE_CreateOverflowPanels DISABLED_CreateOverflowPanels |
| 269 #endif | 269 #endif |
| (...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1650 // End full screen mode, expansion occurs again. | 1650 // End full screen mode, expansion occurs again. |
| 1651 overflow_strip->OnFullScreenModeChanged(false); | 1651 overflow_strip->OnFullScreenModeChanged(false); |
| 1652 EXPECT_TRUE(panel_manager->mouse_watcher()->IsActive()); | 1652 EXPECT_TRUE(panel_manager->mouse_watcher()->IsActive()); |
| 1653 MoveMouse(in_overflow_area); | 1653 MoveMouse(in_overflow_area); |
| 1654 EXPECT_GT(overflow_strip->current_display_width(), iconified_width); | 1654 EXPECT_GT(overflow_strip->current_display_width(), iconified_width); |
| 1655 MoveMouse(beyond_overflow_area); | 1655 MoveMouse(beyond_overflow_area); |
| 1656 EXPECT_EQ(iconified_width, overflow_strip->current_display_width()); | 1656 EXPECT_EQ(iconified_width, overflow_strip->current_display_width()); |
| 1657 | 1657 |
| 1658 panel_manager->CloseAll(); | 1658 panel_manager->CloseAll(); |
| 1659 } | 1659 } |
| OLD | NEW |