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

Unified Diff: chrome/browser/ui/ash/ash_init.cc

Issue 12077055: Made launcher hidden when kicking off chrome in app mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months 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/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();

Powered by Google App Engine
This is Rietveld 408576698