Deprecate Browser::TYPE_PANEL

chrome/browser/ui/ash/window_positioner_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/ash/window_positioner.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_resizer.h"
@@ skipping 37 matching lines @@
 
 TestBrowserWindowAura::TestBrowserWindowAura(aura::Window *native_window)
     : native_window_(native_window) {
 }
 
 TestBrowserWindowAura::~TestBrowserWindowAura() {}
 
 } // namespace
 
 // A test class for preparing window positioner tests - it creates a testing
-// base by adding a window, a popup and a panel which can be independently
+// base by adding a window and a popup which can be independently
 // positioned to see where the positioner will place the window.
 class WindowPositionerTest : public AshTestBase {
  public:
   WindowPositionerTest();
   virtual ~WindowPositionerTest();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  protected:
   aura::Window* window() { return window_.get(); }
   aura::Window* popup() { return popup_.get(); }
-  aura::Window* panel() { return panel_.get(); }
 
   Browser* window_browser() { return window_owning_browser_.get(); }
   Browser* popup_browser() { return popup_owning_browser_.get(); }
-  Browser* panel_browser() { return panel_owning_browser_.get(); }
 
   WindowPositioner* window_positioner() { return window_positioner_; }
 
   // The positioner & desktop's used grid alignment size.
   const int grid_size_;
 
  private:
   WindowPositioner* window_positioner_;
 
   // These two need to be deleted after everything else is gone.
   scoped_ptr<content::TestBrowserThread> ui_thread_;
   scoped_ptr<TestingProfile> profile_;
 
   // These get created for each session.
   scoped_ptr<aura::Window> window_;
   scoped_ptr<aura::Window> popup_;
-  scoped_ptr<aura::Window> panel_;
 
   scoped_ptr<BrowserWindow> browser_window_;
   scoped_ptr<BrowserWindow> browser_popup_;
-  scoped_ptr<BrowserWindow> browser_panel_;
 
   scoped_ptr<Browser> window_owning_browser_;
   scoped_ptr<Browser> popup_owning_browser_;
-  scoped_ptr<Browser> panel_owning_browser_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowPositionerTest);
 };
 
 WindowPositionerTest::WindowPositionerTest()
     : grid_size_(WindowPositioner::kMinimumWindowOffset),
       window_positioner_(NULL) {
   // Create a message loop.
   MessageLoopForUI* ui_loop = message_loop();
   ui_thread_.reset(
       new content::TestBrowserThread(content::BrowserThread::UI, ui_loop));
 
   // Create a browser profile.
   profile_.reset(new TestingProfile());
 }
 
 WindowPositionerTest::~WindowPositionerTest() {
   profile_.reset(NULL);
   ui_thread_.reset(NULL);
 }
 
 void WindowPositionerTest::SetUp() {
   AshTestBase::SetUp();
   // Create some default dummy windows.
   window_.reset(CreateTestWindowInShellWithId(0));
   window_->SetBounds(gfx::Rect(16, 32, 640, 320));
   popup_.reset(CreateTestWindowInShellWithId(1));
   popup_->SetBounds(gfx::Rect(16, 32, 128, 256));
-  panel_.reset(CreateTestWindowInShellWithId(2));
-  panel_->SetBounds(gfx::Rect(32, 48, 256, 512));
 
   // Create a browser for the window.
   browser_window_.reset(new TestBrowserWindowAura(window_.get()));
   Browser::CreateParams window_params(profile_.get(),
                                       chrome::HOST_DESKTOP_TYPE_ASH);
   window_params.window = browser_window_.get();
   window_owning_browser_.reset(new Browser(window_params));
 
   // Creating a browser for the popup.
   browser_popup_.reset(new TestBrowserWindowAura(popup_.get()));
   Browser::CreateParams popup_params(Browser::TYPE_POPUP, profile_.get(),
                                      chrome::HOST_DESKTOP_TYPE_ASH);
   popup_params.window = browser_popup_.get();
   popup_owning_browser_.reset(new Browser(popup_params));
 
-  // Creating a browser for the panel.
-  browser_panel_.reset(new TestBrowserWindowAura(panel_.get()));
-  Browser::CreateParams panel_params(Browser::TYPE_PANEL, profile_.get(),
-                                     chrome::HOST_DESKTOP_TYPE_ASH);
-  panel_params.window = browser_panel_.get();
-  panel_owning_browser_.reset(new Browser(panel_params));
   // We hide all windows upon start - each user is required to set it up
   // as he needs it.
   window()->Hide();
   popup()->Hide();
-  panel()->Hide();
   window_positioner_ = new WindowPositioner();
 }
 
 void WindowPositionerTest::TearDown() {
   // Since the AuraTestBase is needed to create our assets, we have to
   // also delete them before we tear it down.
   window_owning_browser_.reset(NULL);
   popup_owning_browser_.reset(NULL);
-  panel_owning_browser_.reset(NULL);
 
   browser_window_.reset(NULL);
   browser_popup_.reset(NULL);
-  browser_panel_.reset(NULL);
 
   window_.reset(NULL);
   popup_.reset(NULL);
-  panel_.reset(NULL);
 
   AshTestBase::TearDown();
   delete window_positioner_;
   window_positioner_ = NULL;
 }
 
 int AlignToGridRoundDown(int location, int grid_size) {
   if (grid_size <= 1 || location % grid_size == 0)
     return location;
   return location / grid_size * grid_size;
@@ skipping 108 matching lines @@
                                1));
   gfx::Rect top_right = window_positioner()->GetPopupPosition(
                             popup_position);
   EXPECT_EQ(gfx::Rect(AlignToGridRoundDown(work_area.right() -
                                            popup_position.width(), grid_size_),
                       work_area.y(),
                       popup_position.width(), popup_position.height()),
                       top_right);
 }
 
-TEST_F(WindowPositionerTest, blockedByPanel) {
-  const gfx::Rect work_area =
-      Shell::GetScreen()->GetPrimaryDisplay().work_area();
-
-  gfx::Rect pop_position(0, 0, 200, 200);
-  // Let the panel cover everything.
-  panel()->SetBounds(work_area);
-  panel()->Show();
-
-  // Check that the popup does cascade due to the panel's existence.
-  gfx::Rect top_right = window_positioner()->GetPopupPosition(pop_position);
-  EXPECT_EQ(gfx::Rect(work_area.x() + grid_size_, work_area.y() + grid_size_,
-                      pop_position.width(), pop_position.height()),
-                      top_right);
-}
-
 TEST_F(WindowPositionerTest, biggerThenBorder) {
   const gfx::Rect work_area =
       Shell::GetScreen()->GetPrimaryDisplay().work_area();
 
   gfx::Rect pop_position(0, 0, work_area.width(), work_area.height());
 
   // Check that the popup is placed full screen.
   gfx::Rect full = window_positioner()->GetPopupPosition(pop_position);
   EXPECT_EQ(gfx::Rect(work_area.x(), work_area.y(),
                       pop_position.width(), pop_position.height()),
                       full);
 }
 
 }  // namespace test
 }  // namespace ash