chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc - Issue 2540433002: Reland "Propagate information about how ARC apps are launched"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Moved mouse/touch detectors to ARC code 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

« chrome/browser/ui/app_list/arc/arc_app_utils.cc ('K') | « chrome/browser/ui/app_list/search/arc_app_result.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc » ('j') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..08746705afa56c24357bf162e40cce97b3353bdd 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,12 +4,15 @@

#include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"

+#include <string>

#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"

#include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h"

#include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"

#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"

+#include "ui/events/event_constants.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/image/canvas_image_source.h"

#include "ui/gfx/image/image_skia_operations.h"

@@ -131,7 +134,7 @@ void ArcAppDeferredLauncherController::OnAppReadyChanged(

Close(app_id);

- arc::LaunchApp(observed_profile_, app_id);

+ arc::LaunchApp(observed_profile_, app_id, ui::EF_NONE);

}

void ArcAppDeferredLauncherController::OnAppRemoved(const std::string& app_id) {