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

Unified Diff: chrome/browser/lifetime/application_lifetime_aura.cc

Issue 13581008: cros: Explicitly manage app session lifetime. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: solution 2 Created 7 years, 9 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/chromeos/app_mode/startup_app_launcher.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('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 0fdbc65e981d6ff78805067c2a3273bad3aaed72..18503158caaa8862809457610a8962cfde5c0550 100644
--- a/chrome/browser/lifetime/application_lifetime_aura.cc
+++ b/chrome/browser/lifetime/application_lifetime_aura.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/lifetime/application_lifetime.h"
#include "base/command_line.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"
@@ -47,8 +46,7 @@ void HandleAppExitingForPlatform() {
ash::Shell::GetInstance()->output_configurator()->Stop();
if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableZeroBrowsersOpenForTests) &&
- !chrome::IsRunningInAppMode()) {
+ switches::kDisableZeroBrowsersOpenForTests)) {
// 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/chromeos/app_mode/startup_app_launcher.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698