Fix Panel to always detect when a tab is added.

chrome/browser/ui/panels/panel_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/notifications/balloon_collection_impl.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_settings_menu_model.h"
 #include "chrome/browser/web_applications/web_app.h"
@@ skipping 820 matching lines @@
   EXPECT_LE(100, initial_bounds.width());
   EXPECT_LE(100, initial_bounds.height());
 
   // Expand the test page.
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
       panel->browser()->GetSelectedTabContents()->render_view_host(),
       std::wstring(),
       L"changeSize(50);"));
 
   // Wait until the bounds get changed.
-  gfx::Rect bounds_on_grow;
-  while ((bounds_on_grow = panel->GetBounds()) == initial_bounds) {
+  while (panel->GetBounds() == initial_bounds) {

[Paweł Hajdan Jr., 2011/11/14 12:24:33]

Ouch, this is generally bad style (running MessageLoop in a loop). I didn't
notice it before, but I'd appreciate it if you could convert it to wait for an
event in a follow-up (I can explain the rationale off-rietveld if you'd like).

     MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());

[Paweł Hajdan Jr., 2011/11/14 12:24:33]

By the way, I think this QuitTask is redundant with RunAllPending, _unless_ you
do some trickery (like tasks being posted after this QuitTasks), in which case
you have one more point for converting this.

     MessageLoop::current()->RunAllPending();
   }
+  WaitForBoundsAnimationFinished(panel);
+  gfx::Rect bounds_on_grow = panel->GetBounds();
   EXPECT_GT(bounds_on_grow.width(), initial_bounds.width());
   EXPECT_EQ(bounds_on_grow.height(), initial_bounds.height());
 
   // Shrink the test page.
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
       panel->browser()->GetSelectedTabContents()->render_view_host(),
       std::wstring(),
       L"changeSize(-30);"));
 
   // Wait until the bounds get changed.
-  gfx::Rect bounds_on_shrink;
-  while ((bounds_on_shrink = panel->GetBounds()) == bounds_on_grow) {
+  while (panel->GetBounds() == bounds_on_grow) {
     MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
     MessageLoop::current()->RunAllPending();
   }
+  WaitForBoundsAnimationFinished(panel);
+  gfx::Rect bounds_on_shrink = panel->GetBounds();
   EXPECT_LT(bounds_on_shrink.width(), bounds_on_grow.width());
   EXPECT_GT(bounds_on_shrink.width(), initial_bounds.width());
   EXPECT_EQ(bounds_on_shrink.height(), initial_bounds.height());
 
   panel->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, RestoredBounds) {
   // Disable mouse watcher. We don't care about mouse movements in this test.
   PanelManager* panel_manager = PanelManager::GetInstance();
@@ skipping 504 matching lines @@
 
   // Wait for the panels opened by the first extension to close.
   signal.Wait();
   signal1.Wait();
 
   // Verify that the panel that's left is the panel from the second extension.
   EXPECT_EQ(panel_other, panel_manager->panels()[0]);
   panel_other->Close();
 }
 
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateWithExistingContents) {
+  PanelManager::GetInstance()->enable_auto_sizing(true);
+
+  // Load contents into regular tabbed browser.
+  GURL url(ui_test_utils::GetTestUrl(
+      FilePath(FilePath::kCurrentDirectory),
+      FilePath(FILE_PATH_LITERAL("update-preferred-size.html"))));
+  ui_test_utils::NavigateToURL(browser(), url);
+  EXPECT_EQ(1, browser()->tab_count());
+
+  Profile* profile = browser()->profile();
+  Browser* panel_browser = Browser::CreateForApp(
+      Browser::TYPE_PANEL, "SwapIntoMe", gfx::Rect(0, 0, 100, 100), profile);
+  Panel* panel = static_cast<Panel*>(panel_browser->window());
+  EXPECT_EQ(2U, BrowserList::size());
+
+  // Swap tab contents over to the panel from the tabbed browser.
+  TabContentsWrapper* contents =
+      browser()->tabstrip_model()->DetachTabContentsAt(0);
+  panel_browser->tabstrip_model()->InsertTabContentsAt(
+      0, contents, TabStripModel::ADD_NONE);
+  panel_browser->SelectNumberedTab(0);
+  MessageLoopForUI::current()->RunAllPending();
+  EXPECT_EQ(contents, panel_browser->GetSelectedTabContentsWrapper());
+  EXPECT_EQ(1, PanelManager::GetInstance()->num_panels());
+
+  panel->Show();
+  WaitForWindowSizeAvailable(panel);
+  WaitForBoundsAnimationFinished(panel);
+
+  // Ensure that the tab contents were noticed by the panel by
+  // verifying that the panel auto resizes correctly. (Panel
+  // enables auto resizing when tab contents are detected.)
+  gfx::Rect initial_bounds = panel->GetBounds();
+  EXPECT_LE(100, initial_bounds.width());
+  EXPECT_LE(100, initial_bounds.height());
+
+  // Expand the test page.
+  EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
+      panel_browser->GetSelectedTabContents()->render_view_host(),
+      std::wstring(),
+      L"changeSize(50);"));
+  while (panel->GetBounds() == initial_bounds) {

[Paweł Hajdan Jr., 2011/11/14 12:24:33]

Ah, and here the bad code is being repeated. This is new code, so pretty please
use waiting for an event here.

+    MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
+    MessageLoop::current()->RunAllPending();
+  }
+  WaitForBoundsAnimationFinished(panel);
+  gfx::Rect bounds_on_grow = panel->GetBounds();
+  EXPECT_GT(bounds_on_grow.width(), initial_bounds.width());
+  EXPECT_EQ(bounds_on_grow.height(), initial_bounds.height());
+
+  // Swapping tab contents back to the browser should close the panel.
+  ui_test_utils::WindowedNotificationObserver signal(
+      chrome::NOTIFICATION_BROWSER_CLOSED,
+      content::Source<Browser>(panel_browser));
+  panel_browser->ConvertPopupToTabbedBrowser();
+  signal.Wait();
+  EXPECT_EQ(0, PanelManager::GetInstance()->num_panels());
+
+  Browser* tabbed_browser = BrowserList::FindTabbedBrowser(profile, false);
+  EXPECT_EQ(contents, tabbed_browser->GetSelectedTabContentsWrapper());
+  tabbed_browser->window()->Close();
+}
+
 class PanelDownloadTest : public PanelBrowserTest {
  public:
   PanelDownloadTest() : PanelBrowserTest() { }
 
   // Creates a temporary directory for downloads that is auto-deleted
   // on destruction.
   bool CreateDownloadDirectory(Profile* profile) {
     bool created = downloads_directory_.CreateUniqueTempDir();
     if (!created)
       return false;
@@ skipping 304 matching lines @@
   // the same position when short panel is first created.
   panel1->SetExpansionState(Panel::EXPANDED);
   WaitForBoundsAnimationFinished(panel1);
   int balloon_bottom_after_short_panel_expanded =
       GetBalloonBottomPosition(balloon);
   EXPECT_EQ(balloon_bottom_after_short_panel_created,
             balloon_bottom_after_short_panel_expanded);
 
   // Closing short panel should move the notification balloon down to the same
   // position when tall panel brings up its titlebar.
-  panel1->Close();
-  WaitForBoundsAnimationFinished(panel1);
+  CloseWindowAndWait(panel1->browser());
   EXPECT_EQ(balloon_bottom_after_tall_panel_titlebar_up,
             GetBalloonBottomPosition(balloon));
 
   // Closing the remaining tall panel should move the notification balloon back
   // to its original position.
-  panel2->Close();
-  WaitForBoundsAnimationFinished(panel2);
+  CloseWindowAndWait(panel2->browser());
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }