Refactor intra-strip panel drags by introducing PanelDragController.

chrome/browser/ui/panels/panel.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.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/native_panel.h"
+#include "chrome/browser/ui/panels/panel_drag_controller.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 18 matching lines @@
       web_app::GetExtensionIdFromApplicationName(browser->app_name()), false);
 }
 
 Panel::Panel(Browser* browser, const gfx::Size& requested_size)
     : browser_(browser),
       panel_strip_(NULL),
       initialized_(false),
       has_temporary_layout_(false),
       restored_size_(requested_size),
       auto_resizable_(false),
-      draggable_(true),
       expansion_state_(EXPANDED),
       old_expansion_state_(EXPANDED),
       app_icon_visible_(true) {
 }
 
 Panel::~Panel() {
   // Invoked by native panel destructor. Do not access native_panel_ here.
 }
 
 void Panel::Initialize(const gfx::Rect& bounds) {
@@ skipping 135 matching lines @@
 }
 
 void Panel::SetBounds(const gfx::Rect& bounds) {
   // Ignore bounds position as the panel manager controls all positioning.
   manager()->ResizePanel(this, bounds.size());
 }
 
 // Close() may be called multiple times if the browser window is not ready to
 // close on the first attempt.
 void Panel::Close() {
-  native_panel_->ClosePanel();
+  if (manager()->drag_controller()->CanRemovePanel(this))

[jennb, 2012/02/17 21:28:45]

Continue as normal with close here. When panelmanger::remove() is called,
panelmanager can then check with drag controller. All that delayed remove logic
should be hidden from the regular panel close logic.

[jianli, 2012/02/17 23:52:56]

Per discussion, removed.

+    native_panel_->ClosePanel();
 }
 
 void Panel::Activate() {
   panel_strip_->ActivatePanel(this);
   native_panel_->ActivatePanel();
 }
 
 void Panel::Deactivate() {
   native_panel_->DeactivatePanel();
 }
@@ skipping 458 matching lines @@
       native_panel_->ContentSizeFromWindowSize(max_size_));
 }
 
 void Panel::OnWindowSizeAvailable() {
   ConfigureAutoResize(browser()->GetSelectedWebContents());
 }
 
 void Panel::DestroyBrowser() {
   native_panel_->DestroyPanelBrowser();
 }