chrome/browser/ui/ash/ash_init.cc - Issue 12077055: Made launcher hidden when kicking off chrome in app mode.

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/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: rebase 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:

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 17e92378ab36baa44b07921b23c6a958d565cf82..d6484a90ad17e26e7111c248f10dbea65c7c030f 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