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

Unified Diff: chrome/browser/lifetime/application_lifetime_aura.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/app_mode/app_mode_utils.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/lifetime/application_lifetime_aura.cc
diff --git a/chrome/browser/lifetime/application_lifetime_aura.cc b/chrome/browser/lifetime/application_lifetime_aura.cc
index b5d47d3cf064dbbd31fce9fe66d543c7b1ffb60e..4883cae9aef7746d5ff345069f5ef8810c4dfdbc 100644
--- a/chrome/browser/lifetime/application_lifetime_aura.cc
+++ b/chrome/browser/lifetime/application_lifetime_aura.cc
@@ -5,9 +5,11 @@
#include "chrome/browser/lifetime/application_lifetime.h"
#include "base/command_line.h"
-#include "chrome/common/chrome_switches.h"
+#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/notifications/notification_ui_manager.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/switch_utils.h"
#include "ui/views/widget/widget.h"
#if defined(USE_ASH)
@@ -38,7 +40,8 @@ void HandleAppExitingForPlatform() {
#if defined(OS_CHROMEOS)
if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableZeroBrowsersOpenForTests)) {
+ switches::kDisableZeroBrowsersOpenForTests) &&
+ !chrome::IsRunningInAppMode()) {
// App is exiting, call EndKeepAlive() on behalf of Aura Shell.
EndKeepAlive();
// Make sure we have notified the session manager that we are exiting.
« no previous file with comments | « chrome/browser/app_mode/app_mode_utils.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698