summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/bookmark_bar_view.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-04 21:38:07 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-04 21:38:07 +0000
commit8af4c1991ec7ff8d8e6bcd87d882ba0c99e4f916 (patch)
treec17049add98efa0cd11dd1ee0289af7ee848d2a1 /chrome/browser/views/bookmark_bar_view.cc
parenta0c6c257e5715e1e035f831c77ecb02ba209a86c (diff)
downloadchromium_src-8af4c1991ec7ff8d8e6bcd87d882ba0c99e4f916.zip
chromium_src-8af4c1991ec7ff8d8e6bcd87d882ba0c99e4f916.tar.gz
chromium_src-8af4c1991ec7ff8d8e6bcd87d882ba0c99e4f916.tar.bz2
Adding drag-drop support in and out of the Browser Action overflow menu.
BUG=26990 TEST=Drag icons into and out of (and within) both the Browser Action container and its overflow menu. Review URL: http://codereview.chromium.org/570014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
-rw-r--r--chrome/browser/views/bookmark_bar_view.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 4ca2148..fce6a7f 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -1388,13 +1388,7 @@ void BookmarkBarView::StartShowFolderDropMenuTimer(const BookmarkNode* node) {
}
DCHECK(!show_folder_drop_menu_task_);
show_folder_drop_menu_task_ = new ShowFolderDropMenuTask(this, node);
-#if defined(OS_WIN)
- static DWORD delay = 0;
- if (!delay && !SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &delay, 0))
- delay = kShowFolderDropMenuDelay;
-#else
- int delay = kShowFolderDropMenuDelay;
-#endif
+ int delay = View::GetMenuShowDelay();
MessageLoop::current()->PostDelayedTask(FROM_HERE,
show_folder_drop_menu_task_, delay);
}