Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(255)

Side by Side Diff: chrome/browser/ui/panels/panel_overflow_browsertest.cc

Issue 9546001: Support detaching/attaching panels via inter-strip drags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch to land Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/panels/panel_manager.cc ('k') | chrome/browser/ui/panels/panel_strip.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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_manager->MovePanelToStrip(panel, PanelStrip::IN_OVERFLOW); 257 panel_manager->MovePanelToStrip(panel,
258 PanelStrip::IN_OVERFLOW,
259 PanelStrip::DEFAULT_POSITION);
258 EXPECT_FALSE(panel->draggable()); 260 EXPECT_FALSE(panel->draggable());
259 panel_manager->MovePanelToStrip(panel, PanelStrip::DOCKED); 261 panel_manager->MovePanelToStrip(panel,
262 PanelStrip::DOCKED,
263 PanelStrip::DEFAULT_POSITION);
260 EXPECT_TRUE(panel->draggable()); 264 EXPECT_TRUE(panel->draggable());
261 panel->Close(); 265 panel->Close();
262 } 266 }
263 267
264 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, CreateOverflowPanels) { 268 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, CreateOverflowPanels) {
265 PanelManager* panel_manager = PanelManager::GetInstance(); 269 PanelManager* panel_manager = PanelManager::GetInstance();
266 DockedPanelStrip* docked_strip = panel_manager->docked_strip(); 270 DockedPanelStrip* docked_strip = panel_manager->docked_strip();
267 OverflowPanelStrip* overflow_strip = 271 OverflowPanelStrip* overflow_strip =
268 panel_manager->overflow_strip(); 272 panel_manager->overflow_strip();
269 273
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 EXPECT_EQ(1, docked_strip->num_panels()); 650 EXPECT_EQ(1, docked_strip->num_panels());
647 EXPECT_EQ(1, docked_strip->num_temporary_layout_panels()); 651 EXPECT_EQ(1, docked_strip->num_temporary_layout_panels());
648 EXPECT_TRUE(overflow_panel->has_temporary_layout()); 652 EXPECT_TRUE(overflow_panel->has_temporary_layout());
649 653
650 // Make sure the overflow panel actually moves to overflow. 654 // Make sure the overflow panel actually moves to overflow.
651 WaitForLayoutModeChanged(overflow_panel, PanelStrip::IN_OVERFLOW); 655 WaitForLayoutModeChanged(overflow_panel, PanelStrip::IN_OVERFLOW);
652 EXPECT_EQ(0, docked_strip->num_temporary_layout_panels()); 656 EXPECT_EQ(0, docked_strip->num_temporary_layout_panels());
653 657
654 // Hack. Put the "falsely closed" panel back into the panel strip 658 // Hack. Put the "falsely closed" panel back into the panel strip
655 // so we can properly close it to wrap up this test. 659 // so we can properly close it to wrap up this test.
656 docked_strip->AddPanel(panel1); 660 docked_strip->AddPanel(panel1, PanelStrip::DEFAULT_POSITION);
657 661
658 panel0->Close(); 662 panel0->Close();
659 panel1->Close(); 663 panel1->Close();
660 overflow_panel->Close(); 664 overflow_panel->Close();
661 } 665 }
662 666
663 // http://crbug.com/115568 667 // http://crbug.com/115568
664 #if defined(OS_WIN) || defined(OS_MACOSX) 668 #if defined(OS_WIN) || defined(OS_MACOSX)
665 #define MAYBE_ActivateOverflowPanels ActivateOverflowPanels 669 #define MAYBE_ActivateOverflowPanels ActivateOverflowPanels
666 #else 670 #else
(...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after
1644 // End full screen mode, expansion occurs again. 1648 // End full screen mode, expansion occurs again.
1645 overflow_strip->OnFullScreenModeChanged(false); 1649 overflow_strip->OnFullScreenModeChanged(false);
1646 EXPECT_TRUE(panel_manager->mouse_watcher()->IsActive()); 1650 EXPECT_TRUE(panel_manager->mouse_watcher()->IsActive());
1647 MoveMouse(in_overflow_area); 1651 MoveMouse(in_overflow_area);
1648 EXPECT_GT(overflow_strip->current_display_width(), iconified_width); 1652 EXPECT_GT(overflow_strip->current_display_width(), iconified_width);
1649 MoveMouse(beyond_overflow_area); 1653 MoveMouse(beyond_overflow_area);
1650 EXPECT_EQ(iconified_width, overflow_strip->current_display_width()); 1654 EXPECT_EQ(iconified_width, overflow_strip->current_display_width());
1651 1655
1652 panel_manager->CloseAll(); 1656 panel_manager->CloseAll();
1653 } 1657 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel_manager.cc ('k') | chrome/browser/ui/panels/panel_strip.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698