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

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

Issue 9403035: Refactor intra-strip panel drags by introducing PanelDragController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix per feedback Created 8 years, 10 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
Index: chrome/browser/ui/panels/panel.cc
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc
index 6be51041e3c5363060c133ee003e2b2641c14221..24039ab57df32af784174f8a89bef1b17aac1fc0 100644
--- a/chrome/browser/ui/panels/panel.cc
+++ b/chrome/browser/ui/panels/panel.cc
@@ -11,6 +11,7 @@
#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"
@@ -49,7 +50,6 @@ Panel::Panel(Browser* browser, const gfx::Size& requested_size)
has_temporary_layout_(false),
restored_size_(requested_size),
auto_resizable_(false),
- draggable_(true),
expansion_state_(EXPANDED),
old_expansion_state_(EXPANDED),
app_icon_visible_(true) {
@@ -205,7 +205,8 @@ void Panel::SetBounds(const gfx::Rect& bounds) {
// 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 panelmang
jianli 2012/02/17 23:52:56 Per discussion, removed.
+ native_panel_->ClosePanel();
}
void Panel::Activate() {

Powered by Google App Engine
This is Rietveld 408576698