summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame
diff options
context:
space:
mode:
authorerikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-03 23:00:09 +0000
committererikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-03 23:00:09 +0000
commit41291b0e3555aa77d3501c02a75679b1d734d4ee (patch)
tree07a73989105d161f7a02cd7f9d87ca14827005a3 /chrome/browser/views/frame
parent5e9877eb405ec97622d419a146b9b7c331568bf6 (diff)
downloadchromium_src-41291b0e3555aa77d3501c02a75679b1d734d4ee.zip
chromium_src-41291b0e3555aa77d3501c02a75679b1d734d4ee.tar.gz
chromium_src-41291b0e3555aa77d3501c02a75679b1d734d4ee.tar.bz2
Part 1 of dragging extensions on the shelf. This part was just about getting the mechanics of the shelf handle and the dragging correct. Part 2 will actually allow the order to be changed.TEST=hover over an extension toolstrip, grab the handle and drag. release.
Review URL: http://codereview.chromium.org/119103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
-rw-r--r--chrome/browser/views/frame/browser_view.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 3714952..078faac 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -567,7 +567,9 @@ void BrowserView::AttachBrowserBubble(BrowserBubble* bubble) {
}
void BrowserView::DetachBrowserBubble(BrowserBubble* bubble) {
- browser_bubbles_.erase(bubble);
+ BubbleSet::iterator it = browser_bubbles_.find(bubble);
+ if (it != browser_bubbles_.end())
+ browser_bubbles_.erase(it);
}
///////////////////////////////////////////////////////////////////////////////