Index: chrome/browser/ui/ash/ash_init.cc |
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc |
index ef9d18aac8da618a07326e2a671faee0005624d0..3a3710cf9a136890739a3979a0356d5036544744 100644 |
--- a/chrome/browser/ui/ash/ash_init.cc |
+++ b/chrome/browser/ui/ash/ash_init.cc |
@@ -20,6 +20,7 @@ |
#include "chrome/browser/ui/ash/event_rewriter.h" |
#include "chrome/browser/ui/ash/screenshot_taker.h" |
#include "chrome/common/chrome_switches.h" |
+#include "chrome/common/switch_utils.h" |
#include "ui/aura/aura_switches.h" |
#include "ui/aura/display_util.h" |
#include "ui/aura/env.h" |
@@ -106,8 +107,9 @@ void OpenAsh() { |
SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL); |
if (!CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kDisableZeroBrowsersOpenForTests)) { |
- browser::StartKeepAlive(); |
+ switches::kDisableZeroBrowsersOpenForTests) && |
+ !switches::IsRunningInAppMode()) { |
+ browser::StartKeepAlive(); |
oshima
2013/01/30 06:14:35
I think you should skip EndKeepAlive
in applicatio
zel
2013/01/30 17:06:43
Done.
|
} |
#endif |
ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); |