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

Side by Side Diff: chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc

Issue 2259033002: Revert of arc: Handle non-launchable apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h" 5 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"
6 6
7 #include "ash/common/shelf/shelf_item_types.h" 7 #include "ash/common/shelf/shelf_item_types.h"
8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
10 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" 8 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
11 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
12 10
13 ArcLauncherContextMenu::ArcLauncherContextMenu( 11 ArcLauncherContextMenu::ArcLauncherContextMenu(
14 ChromeLauncherControllerImpl* controller, 12 ChromeLauncherControllerImpl* controller,
15 const ash::ShelfItem* item, 13 const ash::ShelfItem* item,
16 ash::WmShelf* wm_shelf) 14 ash::WmShelf* wm_shelf)
17 : LauncherContextMenu(controller, item, wm_shelf) { 15 : LauncherContextMenu(controller, item, wm_shelf) {
18 Init(); 16 Init();
19 } 17 }
20 18
21 ArcLauncherContextMenu::~ArcLauncherContextMenu() {} 19 ArcLauncherContextMenu::~ArcLauncherContextMenu() {}
22 20
23 void ArcLauncherContextMenu::Init() { 21 void ArcLauncherContextMenu::Init() {
24 const ArcAppListPrefs* arc_list_prefs =
25 ArcAppListPrefs::Get(controller()->GetProfile());
26 DCHECK(arc_list_prefs);
27
28 const std::string app_id = controller()->GetAppIDForShelfID(item().id);
29 std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
30 arc_list_prefs->GetApp(app_id);
31 if (!app_info) {
32 NOTREACHED();
33 return;
34 }
35
36 const bool app_is_open = controller()->IsOpen(item().id); 22 const bool app_is_open = controller()->IsOpen(item().id);
37 if (!app_is_open) { 23 if (!app_is_open) {
38 DCHECK(app_info->launchable);
39 AddItemWithStringId(MENU_OPEN_NEW, IDS_APP_CONTEXT_MENU_ACTIVATE_ARC); 24 AddItemWithStringId(MENU_OPEN_NEW, IDS_APP_CONTEXT_MENU_ACTIVATE_ARC);
40 AddSeparator(ui::NORMAL_SEPARATOR); 25 AddSeparator(ui::NORMAL_SEPARATOR);
41 } 26 }
42 27 AddPinMenu();
43 if (app_info->launchable)
44 AddPinMenu();
45
46 if (app_is_open) 28 if (app_is_open)
47 AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE); 29 AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
48 AddSeparator(ui::NORMAL_SEPARATOR); 30 AddSeparator(ui::NORMAL_SEPARATOR);
49 AddShelfOptionsMenu(); 31 AddShelfOptionsMenu();
50 } 32 }
51 33
52 bool ArcLauncherContextMenu::IsCommandIdEnabled(int command_id) const { 34 bool ArcLauncherContextMenu::IsCommandIdEnabled(int command_id) const {
53 if (command_id == MENU_OPEN_NEW) 35 if (command_id == MENU_OPEN_NEW)
54 return true; 36 return true;
55 return LauncherContextMenu::IsCommandIdEnabled(command_id); 37 return LauncherContextMenu::IsCommandIdEnabled(command_id);
56 } 38 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698