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

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

Issue 10908153: [Panel refactor] Deprecate old panels. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux_chromeos test failure Created 8 years, 3 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 | « chrome/browser/ui/panels/panel_manager.h ('k') | chrome/browser/ui/panels/panel_mouse_watcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_manager.cc
diff --git a/chrome/browser/ui/panels/panel_manager.cc b/chrome/browser/ui/panels/panel_manager.cc
index 1e81f288b529312ff73d092b416a0f484e676e46..d7800d39f7e3d56f74bebd05605a8e9b7da89a53 100644
--- a/chrome/browser/ui/panels/panel_manager.cc
+++ b/chrome/browser/ui/panels/panel_manager.cc
@@ -9,12 +9,8 @@
#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"
@@ -98,14 +94,6 @@ bool PanelManager::ShouldUsePanels(const std::string& extension_id) {
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) {
@@ -159,25 +147,11 @@ 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
@@ -217,15 +191,8 @@ Panel* PanelManager::CreatePanel(Browser* browser,
}
// 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 &&
@@ -345,20 +312,6 @@ 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());
« no previous file with comments | « chrome/browser/ui/panels/panel_manager.h ('k') | chrome/browser/ui/panels/panel_mouse_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698