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

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc

Issue 2540433002: Reland "Propagate information about how ARC apps are launched" (Closed)
Patch Set: Propagate flag from deferred launcher Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc
index 2bc17384b35a1956bee1997c9ae3377ea1f28f4a..8ee6307fcc5a9ffd875bdfc0e41412e6c2b28a9c 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
+#include <string>
khmel 2016/11/28 23:23:48 nit: Remove it here. You included it in .h file.
Luis Héctor Chávez 2016/11/28 23:27:56 Done.
+
#include "chrome/browser/chromeos/arc/arc_support_host.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
@@ -131,7 +133,7 @@ void ArcAppDeferredLauncherController::OnAppReadyChanged(
Close(app_id);
- arc::LaunchApp(observed_profile_, app_id);
+ arc::LaunchApp(observed_profile_, app_id, it->second->event_flags());
}
void ArcAppDeferredLauncherController::OnAppRemoved(const std::string& app_id) {
@@ -179,7 +181,8 @@ void ArcAppDeferredLauncherController::RegisterNextUpdate() {
}
void ArcAppDeferredLauncherController::RegisterDeferredLaunch(
- const std::string& app_id) {
+ const std::string& app_id,
+ int event_flags) {
const arc::ArcSessionManager* arc_session_manager =
arc::ArcSessionManager::Get();
DCHECK(arc_session_manager);
@@ -203,8 +206,8 @@ void ArcAppDeferredLauncherController::RegisterDeferredLaunch(
}
ArcAppDeferredLauncherItemController* controller =
- new ArcAppDeferredLauncherItemController(shelf_app_id, owner_,
- weak_ptr_factory_.GetWeakPtr());
+ new ArcAppDeferredLauncherItemController(
+ shelf_app_id, owner_, event_flags, weak_ptr_factory_.GetWeakPtr());
if (shelf_id == 0) {
owner_->CreateAppLauncherItem(controller, shelf_app_id,
ash::STATUS_RUNNING);

Powered by Google App Engine
This is Rietveld 408576698