summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/ash/ash_init.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/ash/ash_init.cc')
-rw-r--r--chrome/browser/ui/ash/ash_init.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index 17e9237..d6484a9 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -13,6 +13,7 @@
#include "ash/wm/event_rewriter_event_filter.h"
#include "ash/wm/property_util.h"
#include "base/command_line.h"
+#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
#include "chrome/browser/lifetime/application_lifetime.h"
@@ -106,7 +107,8 @@ void OpenAsh() {
SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL);
if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableZeroBrowsersOpenForTests)) {
+ switches::kDisableZeroBrowsersOpenForTests) &&
+ !chrome::IsRunningInAppMode()) {
chrome::StartKeepAlive();
}
#endif