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

Side by Side Diff: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.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 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 <memory> 7 #include <memory>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 19 matching lines...) Expand all
30 30
31 base::TimeDelta ArcAppDeferredLauncherItemController::GetActiveTime() const { 31 base::TimeDelta ArcAppDeferredLauncherItemController::GetActiveTime() const {
32 return base::Time::Now() - start_time_; 32 return base::Time::Now() - start_time_;
33 } 33 }
34 34
35 ash::ShelfItemDelegate::PerformedAction 35 ash::ShelfItemDelegate::PerformedAction
36 ArcAppDeferredLauncherItemController::ItemSelected(const ui::Event& event) { 36 ArcAppDeferredLauncherItemController::ItemSelected(const ui::Event& event) {
37 return ash::ShelfItemDelegate::kNoAction; 37 return ash::ShelfItemDelegate::kNoAction;
38 } 38 }
39 39
40 ui::SimpleMenuModel* 40 ash::ShelfAppMenuItemList ArcAppDeferredLauncherItemController::GetAppMenuItems(
41 ArcAppDeferredLauncherItemController::CreateApplicationMenu(int event_flags) { 41 int event_flags) {
42 return nullptr; 42 return ash::ShelfAppMenuItemList();
43 } 43 }
44 44
45 void ArcAppDeferredLauncherItemController::Close() { 45 void ArcAppDeferredLauncherItemController::Close() {
46 if (host_) 46 if (host_)
47 host_->Close(app_id()); 47 host_->Close(app_id());
48 } 48 }
49 49
50 void ArcAppDeferredLauncherItemController::Launch(ash::LaunchSource source, 50 void ArcAppDeferredLauncherItemController::Launch(ash::LaunchSource source,
51 int event_flags) {} 51 int event_flags) {}
52 52
53 ash::ShelfItemDelegate::PerformedAction 53 ash::ShelfItemDelegate::PerformedAction
54 ArcAppDeferredLauncherItemController::Activate(ash::LaunchSource source) { 54 ArcAppDeferredLauncherItemController::Activate(ash::LaunchSource source) {
55 return ash::ShelfItemDelegate::kNoAction; 55 return ash::ShelfItemDelegate::kNoAction;
56 } 56 }
57
58 ChromeLauncherAppMenuItems
59 ArcAppDeferredLauncherItemController::GetApplicationList(int event_flags) {
60 return ChromeLauncherAppMenuItems();
61 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698