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

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

Issue 2540433002: Reland "Propagate information about how ARC apps are launched" (Closed)
Patch Set: Propagate flag from deferred launcher Created 4 years 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>
8
7 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 11 #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" 12 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
11 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h" 13 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 14 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
13 15
14 ArcAppDeferredLauncherItemController::ArcAppDeferredLauncherItemController( 16 ArcAppDeferredLauncherItemController::ArcAppDeferredLauncherItemController(
15 const std::string& arc_app_id, 17 const std::string& arc_app_id,
16 ChromeLauncherController* controller, 18 ChromeLauncherController* controller,
19 int event_flags,
17 const base::WeakPtr<ArcAppDeferredLauncherController>& host) 20 const base::WeakPtr<ArcAppDeferredLauncherController>& host)
18 : LauncherItemController(TYPE_APP, arc_app_id, "", controller), 21 : LauncherItemController(TYPE_APP, arc_app_id, "", controller),
22 event_flags_(event_flags),
19 host_(host), 23 host_(host),
20 start_time_(base::Time::Now()) {} 24 start_time_(base::Time::Now()) {}
21 25
22 ArcAppDeferredLauncherItemController::~ArcAppDeferredLauncherItemController() { 26 ArcAppDeferredLauncherItemController::~ArcAppDeferredLauncherItemController() {
23 if (host_) 27 if (host_)
24 host_->Remove(app_id()); 28 host_->Remove(app_id());
25 } 29 }
26 30
27 base::TimeDelta ArcAppDeferredLauncherItemController::GetActiveTime() const { 31 base::TimeDelta ArcAppDeferredLauncherItemController::GetActiveTime() const {
28 return base::Time::Now() - start_time_; 32 return base::Time::Now() - start_time_;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 82
79 ash::ShelfItemDelegate::PerformedAction 83 ash::ShelfItemDelegate::PerformedAction
80 ArcAppDeferredLauncherItemController::Activate(ash::LaunchSource source) { 84 ArcAppDeferredLauncherItemController::Activate(ash::LaunchSource source) {
81 return ash::ShelfItemDelegate::kNoAction; 85 return ash::ShelfItemDelegate::kNoAction;
82 } 86 }
83 87
84 ChromeLauncherAppMenuItems 88 ChromeLauncherAppMenuItems
85 ArcAppDeferredLauncherItemController::GetApplicationList(int event_flags) { 89 ArcAppDeferredLauncherItemController::GetApplicationList(int event_flags) {
86 return ChromeLauncherAppMenuItems(); 90 return ChromeLauncherAppMenuItems();
87 } 91 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698