chrome/browser/ui/panels/detached_panel_strip.cc - Issue 9560002: Cleanup to keep panel from manipulating its panel strip assignment directly.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9560002: Cleanup to keep panel from manipulating its panel strip assignment directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« no previous file with comments | « chrome/browser/ui/panels/detached_panel_strip.h ('k') | chrome/browser/ui/panels/docked_panel_strip.h » ('j') | chrome/browser/ui/panels/docked_panel_strip.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/panels/detached_panel_strip.cc

diff --git a/chrome/browser/ui/panels/detached_panel_strip.cc b/chrome/browser/ui/panels/detached_panel_strip.cc

index c0e35acc42f22ff492f1563fbccca5d44eaee820..615814d4a0458a43070fd4d0f63773c6d1c6217c 100644

--- a/chrome/browser/ui/panels/detached_panel_strip.cc

+++ b/chrome/browser/ui/panels/detached_panel_strip.cc

@@ -34,12 +34,14 @@ void DetachedPanelStrip::RefreshLayout() {

}

void DetachedPanelStrip::AddPanel(Panel* panel) {

- DCHECK_EQ(this, panel->panel_strip());

+ DCHECK_NE(this, panel->panel_strip());

+ panel->SetPanelStrip(this);

panels_.insert(panel);

}

-bool DetachedPanelStrip::RemovePanel(Panel* panel) {

- return panels_.erase(panel) != 0;

+void DetachedPanelStrip::RemovePanel(Panel* panel) {

+ DCHECK_EQ(this, panel->panel_strip());

+ panels_.erase(panel);

Andrei 2012/03/01 00:08:50 Same comment about SetPaneStrip() as for the docke

}

void DetachedPanelStrip::CloseAll() {