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

Unified Diff: chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_launcher.cc

Issue 2540433002: Reland "Propagate information about how ARC apps are launched" (Closed)
Patch Set: Fixed use-after-free 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_launcher.cc
diff --git a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_launcher.cc b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_launcher.cc
index 3c948c17b71ae8ac639d8c26674e8e7b3564784e..7ff06f502d32aa76ac366c7b906b993d1e41ea18 100644
--- a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_launcher.cc
+++ b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_launcher.cc
@@ -4,10 +4,14 @@
#include <chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_launcher.h>
+#include <memory>
+#include <string>
+
#include "ash/wm/window_util.h"
#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
#include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
#include "ui/aura/env.h"
+#include "ui/events/event_constants.h"
namespace chromeos {
@@ -17,8 +21,8 @@ ArcKioskAppLauncher::ArcKioskAppLauncher(content::BrowserContext* context,
: app_id_(app_id), prefs_(prefs) {
prefs_->AddObserver(this);
aura::Env::GetInstance()->AddObserver(this);
- // Launching the app by app id in landscape mode.
- arc::LaunchApp(context, app_id_);
+ // Launching the app by app id in landscape mode and in non-touch mode.
+ arc::LaunchApp(context, app_id_, ui::EF_NONE);
}
ArcKioskAppLauncher::~ArcKioskAppLauncher() {
« no previous file with comments | « no previous file | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698