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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc

Issue 2671923002: mash: Cleanup ash shelf application menu code. (Closed)
Patch Set: Add comments Created 3 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/ash/launcher/chrome_launcher_app_menu_item_browser.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc
index 55cfb624ee7db245b61276994dd4b6f4cd388096..c217f9c5cfe92c65ab27c020274c05b3ad84346b 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc
@@ -16,10 +16,8 @@
ChromeLauncherAppMenuItemBrowser::ChromeLauncherAppMenuItemBrowser(
const base::string16 title,
const gfx::Image* icon,
- Browser* browser,
- bool has_leading_separator)
- : ChromeLauncherAppMenuItem(title, icon, has_leading_separator),
- browser_(browser) {
+ Browser* browser)
+ : ash::ShelfApplicationMenuItem(title, icon), browser_(browser) {
DCHECK(browser);
registrar_.Add(this,
chrome::NOTIFICATION_BROWSER_CLOSING,
@@ -28,10 +26,6 @@ ChromeLauncherAppMenuItemBrowser::ChromeLauncherAppMenuItemBrowser(
ChromeLauncherAppMenuItemBrowser::~ChromeLauncherAppMenuItemBrowser() {}
-bool ChromeLauncherAppMenuItemBrowser::IsEnabled() const {
- return true;
-}
-
void ChromeLauncherAppMenuItemBrowser::Execute(int event_flags) {
if (browser_) {
if (event_flags & (ui::EF_SHIFT_DOWN | ui::EF_MIDDLE_MOUSE_BUTTON)) {

Powered by Google App Engine
This is Rietveld 408576698