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

Unified Diff: chrome/browser/ui/panels/detached_panel_browsertest.cc

Issue 9560002: Cleanup to keep panel from manipulating its panel strip assignment directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed final nits Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/panels/detached_panel_strip.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/detached_panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/detached_panel_browsertest.cc b/chrome/browser/ui/panels/detached_panel_browsertest.cc
index b2b5e1b1b8317b70c6aa22805aceb0dabda12b60..24e22c14444ff0bf9cca5c4084c9e1ebbacc5da6 100644
--- a/chrome/browser/ui/panels/detached_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/detached_panel_browsertest.cc
@@ -12,8 +12,7 @@
class DetachedPanelBrowserTest : public BasePanelBrowserTest {
};
-IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest,
- DISABLED_CheckDetachedPanelProperties) {
+IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, CheckDetachedPanelProperties) {
PanelManager* panel_manager = PanelManager::GetInstance();
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
@@ -27,14 +26,13 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest,
// Move panels to detached strip.
EXPECT_EQ(2, panel_manager->num_panels());
EXPECT_EQ(0, detached_strip->num_panels());
- panel1->MoveToStrip(detached_strip);
- panel2->MoveToStrip(detached_strip);
+ panel_manager->MovePanelToStrip(panel1, PanelStrip::DETACHED);
+ panel_manager->MovePanelToStrip(panel2, PanelStrip::DETACHED);
EXPECT_EQ(2, panel_manager->num_panels());
EXPECT_EQ(2, detached_strip->num_panels());
- std::vector<Panel*> panels = panel_manager->panels();
- EXPECT_EQ(panel1, panels[0]);
- EXPECT_EQ(panel2, panels[1]);
+ EXPECT_TRUE(detached_strip->HasPanel(panel1));
+ EXPECT_TRUE(detached_strip->HasPanel(panel2));
EXPECT_TRUE(panel1->draggable());
EXPECT_TRUE(panel2->draggable());
@@ -44,11 +42,10 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest,
IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DragDetachedPanel) {
PanelManager* panel_manager = PanelManager::GetInstance();
- DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
// Create one detached panel.
Panel* panel = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 250, 200));
- panel->MoveToStrip(detached_strip);
+ panel_manager->MovePanelToStrip(panel, PanelStrip::DETACHED);
// Test that the detached panel can be dragged anywhere.
scoped_ptr<NativePanelTesting> panel_testing(
@@ -101,10 +98,10 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, CloseDetachedPanelOnDrag) {
Panel* panel2 = CreatePanelWithBounds("Panel2", gfx::Rect(0, 0, 110, 110));
Panel* panel3 = CreatePanelWithBounds("Panel3", gfx::Rect(0, 0, 120, 120));
Panel* panel4 = CreatePanelWithBounds("Panel4", gfx::Rect(0, 0, 130, 130));
- panel1->MoveToStrip(detached_strip);
- panel2->MoveToStrip(detached_strip);
- panel3->MoveToStrip(detached_strip);
- panel4->MoveToStrip(detached_strip);
+ panel_manager->MovePanelToStrip(panel1, PanelStrip::DETACHED);
+ panel_manager->MovePanelToStrip(panel2, PanelStrip::DETACHED);
+ panel_manager->MovePanelToStrip(panel3, PanelStrip::DETACHED);
+ panel_manager->MovePanelToStrip(panel4, PanelStrip::DETACHED);
ASSERT_EQ(4, detached_strip->num_panels());
scoped_ptr<NativePanelTesting> panel1_testing(
« no previous file with comments | « no previous file | chrome/browser/ui/panels/detached_panel_strip.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698