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

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

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)
Patch Set: Address most comments, except manifest, need to sync. Created 4 years, 2 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_app_deferred_launcher_item_controll er.h" 5 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controll er.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 9 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
10 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h" 10 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
(...skipping 17 matching lines...) Expand all
28 return base::Time::Now() - start_time_; 28 return base::Time::Now() - start_time_;
29 } 29 }
30 30
31 ash::ShelfItemDelegate::PerformedAction 31 ash::ShelfItemDelegate::PerformedAction
32 ArcAppDeferredLauncherItemController::ItemSelected(const ui::Event& event) { 32 ArcAppDeferredLauncherItemController::ItemSelected(const ui::Event& event) {
33 return ash::ShelfItemDelegate::kNoAction; 33 return ash::ShelfItemDelegate::kNoAction;
34 } 34 }
35 35
36 base::string16 ArcAppDeferredLauncherItemController::GetTitle() { 36 base::string16 ArcAppDeferredLauncherItemController::GetTitle() {
37 ArcAppListPrefs* arc_prefs = 37 ArcAppListPrefs* arc_prefs =
38 ArcAppListPrefs::Get(launcher_controller()->GetProfile()); 38 ArcAppListPrefs::Get(launcher_controller()->profile());
39 DCHECK(arc_prefs); 39 DCHECK(arc_prefs);
40 std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = arc_prefs->GetApp( 40 std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = arc_prefs->GetApp(
41 ArcAppWindowLauncherController::GetArcAppIdFromShelfAppId(app_id())); 41 ArcAppWindowLauncherController::GetArcAppIdFromShelfAppId(app_id()));
42 if (!app_info) { 42 if (!app_info) {
43 NOTREACHED(); 43 NOTREACHED();
44 return base::string16(); 44 return base::string16();
45 } 45 }
46 46
47 return base::UTF8ToUTF16(app_info->name); 47 return base::UTF8ToUTF16(app_info->name);
48 } 48 }
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 ash::ShelfItemDelegate::PerformedAction 83 ash::ShelfItemDelegate::PerformedAction
84 ArcAppDeferredLauncherItemController::Activate(ash::LaunchSource source) { 84 ArcAppDeferredLauncherItemController::Activate(ash::LaunchSource source) {
85 return ash::ShelfItemDelegate::kNoAction; 85 return ash::ShelfItemDelegate::kNoAction;
86 } 86 }
87 87
88 ChromeLauncherAppMenuItems 88 ChromeLauncherAppMenuItems
89 ArcAppDeferredLauncherItemController::GetApplicationList(int event_flags) { 89 ArcAppDeferredLauncherItemController::GetApplicationList(int event_flags) {
90 return ChromeLauncherAppMenuItems(); 90 return ChromeLauncherAppMenuItems();
91 } 91 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698