| Index: chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.cc
|
| index 5c61a1f6a10a0ef770971969b52afdb3462d4f7b..bfa301800c382866d87f7b886af2e44837f3813f 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.cc
|
| @@ -11,20 +11,13 @@ ChromeLauncherAppMenuItemV2App::ChromeLauncherAppMenuItemV2App(
|
| const gfx::Image* icon,
|
| const std::string& app_id,
|
| ChromeLauncherController* launcher_controller,
|
| - int app_index,
|
| - bool has_leading_separator)
|
| - : ChromeLauncherAppMenuItem(title, icon, has_leading_separator),
|
| + int app_index)
|
| + : ash::ShelfApplicationMenuItem(title, icon),
|
| launcher_controller_(launcher_controller),
|
| app_id_(app_id),
|
| - app_index_(app_index) {
|
| -}
|
| -
|
| -ChromeLauncherAppMenuItemV2App::~ChromeLauncherAppMenuItemV2App() {
|
| -}
|
| + app_index_(app_index) {}
|
|
|
| -bool ChromeLauncherAppMenuItemV2App::IsEnabled() const {
|
| - return true;
|
| -}
|
| +ChromeLauncherAppMenuItemV2App::~ChromeLauncherAppMenuItemV2App() {}
|
|
|
| void ChromeLauncherAppMenuItemV2App::Execute(int event_flags) {
|
| // Note: At this time there is only a single app running at any point. as
|
|
|