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

Unified Diff: trunk/src/chrome/browser/ui/toolbar/wrench_menu_model.cc

Issue 416903002: Revert 285142 "Open the WrenchMenu on mouseover when dragging a ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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 | « no previous file | trunk/src/chrome/browser/ui/views/extensions/browser_action_drag_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/toolbar/wrench_menu_model.cc
===================================================================
--- trunk/src/chrome/browser/ui/toolbar/wrench_menu_model.cc (revision 285300)
+++ trunk/src/chrome/browser/ui/toolbar/wrench_menu_model.cc (working copy)
@@ -15,7 +15,6 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/defaults.h"
-#include "chrome/browser/extensions/extension_toolbar_model.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/search/search.h"
@@ -741,12 +740,8 @@
void WrenchMenuModel::CreateExtensionToolbarOverflowMenu() {
#if defined(TOOLKIT_VIEWS)
AddItem(IDC_EXTENSIONS_OVERFLOW_MENU, base::string16());
- // We only add the separator if there are > 0 items to show in the overflow.
- extensions::ExtensionToolbarModel* toolbar_model =
- extensions::ExtensionToolbarModel::Get(browser_->profile());
- // A count of -1 means all actions are visible.
- if (toolbar_model->GetVisibleIconCount() != -1)
- AddSeparator(ui::UPPER_SEPARATOR);
+ // TODO(devlin): Add the separator only if there are > 0 icons to show.
+ AddSeparator(ui::UPPER_SEPARATOR);
#endif // defined(TOOLKIT_VIEWS)
}
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/views/extensions/browser_action_drag_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698