[Panel refactor] Deprecate old panels.

chrome/browser/ui/panels/panel_manager.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/panels/panel_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/panels/detached_panel_strip.h"
 #include "chrome/browser/ui/panels/docked_panel_strip.h"
-#include "chrome/browser/ui/panels/old_panel.h"
 #include "chrome/browser/ui/panels/panel_drag_controller.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/browser/ui/panels/panel_resize_controller.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 
 #if defined(TOOLKIT_GTK)
@@ skipping 63 matching lines @@
         switches::kEnablePanels) ||
         extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd") ||
         extension_id == std::string("ljclpkphhpbpinifbeabbhlfddcpfdde") ||
         extension_id == std::string("ppleadejekpmccmnpjdimmlfljlkdfej") ||
         extension_id == std::string("eggnbpckecmjlblplehfpjjdhhidfdoj");
   }
 
   return true;
 }
 
-// static
-bool PanelManager::UseBrowserlessPanels() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kOldPanels))
-    return false;
-
-  return chrome::VersionInfo::GetChannel() <= chrome::VersionInfo::CHANNEL_DEV;
-}
-
 PanelManager::PanelManager()
     : panel_mouse_watcher_(PanelMouseWatcher::Create()),
       auto_sizing_enabled_(true) {
   // DisplaySettingsProvider should be created before the creation of strips
   // since some strip might depend on it.
   display_settings_provider_.reset(DisplaySettingsProvider::Create());
   display_settings_provider_->AddDisplayAreaObserver(this);
 
   detached_strip_.reset(new DetachedPanelStrip(this));
   docked_strip_.reset(new DockedPanelStrip(this));
@@ skipping 33 matching lines @@
 }
 
 int PanelManager::GetMaxPanelWidth() const {
   return static_cast<int>(display_area_.width() * kPanelMaxWidthFactor);
 }
 
 int PanelManager::GetMaxPanelHeight() const {
   return display_area_.height() * kPanelMaxHeightFactor;
 }
 
-Panel* PanelManager::CreatePanel(Browser* browser) {
-  return CreatePanel(browser, "", NULL, GURL(),
-                     browser->override_bounds(), CREATE_AS_DOCKED);
-}
-
 Panel* PanelManager::CreatePanel(const std::string& app_name,
                                  Profile* profile,
                                  const GURL& url,
                                  const gfx::Rect& requested_bounds,
                                  CreateMode mode) {
-  return CreatePanel(NULL, app_name, profile, url, requested_bounds, mode);
-}
-
-Panel* PanelManager::CreatePanel(Browser* browser,
-                                 const std::string& app_name,
-                                 Profile* profile,
-                                 const GURL& url,
-                                 const gfx::Rect& requested_bounds,
-                                 CreateMode mode) {
   // Need to sync the display area if no panel is present. This is because:
   // 1) Display area is not initialized until first panel is created.
   // 2) On windows, display settings notification is tied to a window. When
   //    display settings are changed at the time that no panel exists, we do
   //    not receive any notification.
   if (num_panels() == 0) {
     display_settings_provider_->OnDisplaySettingsChanged();
     display_settings_provider_->AddFullScreenObserver(this);
   }
 
@@ skipping 19 matching lines @@
 
   gfx::Rect bounds(width, height);
   if (CREATE_AS_DOCKED == mode) {
     bounds.set_origin(docked_strip_->GetDefaultPositionForPanel(bounds.size()));
   } else {
     bounds.set_origin(requested_bounds.origin());
     bounds = bounds.AdjustToFit(display_settings_provider_->GetDisplayArea());
   }
 
   // Create the panel.
-  Panel* panel;
-  if (browser) {
-    // Legacy panel. Delete after refactor.
-    panel = new OldPanel(browser, min_size, max_size);
-    panel->Initialize(bounds, browser);
-  } else {
-    panel = new Panel(app_name, min_size, max_size);
-    panel->Initialize(profile, url, bounds);
-  }
+  Panel* panel = new Panel(app_name, min_size, max_size);
+  panel->Initialize(profile, url, bounds);
 
   // Auto resizable feature is enabled only if no initial size is requested.
   if (auto_sizing_enabled() && requested_bounds.width() == 0 &&
       requested_bounds.height() == 0) {
     panel->SetAutoResizable(true);
   }
 
   // Add the panel to the appropriate panel strip.
   // Delay layout refreshes in case multiple panels are created within
   // a short time of one another or the focus changes shortly after panel
@@ skipping 99 matching lines @@
 }
 
 bool PanelManager::ShouldBringUpTitlebars(int mouse_x, int mouse_y) const {
   return docked_strip_->ShouldBringUpTitlebars(mouse_x, mouse_y);
 }
 
 void PanelManager::BringUpOrDownTitlebars(bool bring_up) {
   docked_strip_->BringUpOrDownTitlebars(bring_up);
 }
 
-BrowserWindow* PanelManager::GetNextBrowserWindowToActivate(
-    Browser* current_browser) const {
-  // Find the last active browser window that is not minimized.
-  BrowserList::const_reverse_iterator iter = BrowserList::begin_last_active();
-  BrowserList::const_reverse_iterator end = BrowserList::end_last_active();
-  for (; (iter != end); ++iter) {
-    Browser* browser = *iter;
-    if (current_browser != browser && !browser->window()->IsMinimized())
-      return browser->window();
-  }
-
-  return NULL;
-}
-
 void PanelManager::CloseAll() {
   DCHECK(!drag_controller_->IsDragging());
 
   detached_strip_->CloseAll();
   docked_strip_->CloseAll();
 }
 
 int PanelManager::num_panels() const {
   return detached_strip_->num_panels() + docked_strip_->num_panels();
 }
@@ skipping 14 matching lines @@
 void PanelManager::SetMouseWatcher(PanelMouseWatcher* watcher) {
   panel_mouse_watcher_.reset(watcher);
 }
 
 void PanelManager::OnPanelAnimationEnded(Panel* panel) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
       content::Source<Panel>(panel),
       content::NotificationService::NoDetails());
 }