summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/system_indicator
diff options
context:
space:
mode:
authorbenwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 05:18:58 +0000
committerbenwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 05:18:58 +0000
commitd9d0276599ea5a23f2e5c5aa8fc3040ee18bd579 (patch)
tree6ed88f5b4b2fdb32df749f5c2676f9613c51a092 /chrome/browser/extensions/api/system_indicator
parente93b70ccbb53c6fec20427019b421a05a371114e (diff)
downloadchromium_src-d9d0276599ea5a23f2e5c5aa8fc3040ee18bd579.zip
chromium_src-d9d0276599ea5a23f2e5c5aa8fc3040ee18bd579.tar.gz
chromium_src-d9d0276599ea5a23f2e5c5aa8fc3040ee18bd579.tar.bz2
Revert 170660
This change causes shutdown crashes when chrome menu is used to exit. > Keep browser process alive while there are platform apps with background pages running. This does not happen on Android or ChromeOS builds: Android does not support browser process keep alive, and ChromeOS does not need or like it. > > This change prevents platform apps getting killed unceremoniously while they have background pages active. > > This also delays the process being shutdown after closing the last platform app window, as background pages are kept alive for 15 seconds after their last activity is completed. > > This change re-lands r165772 which caused problems on Google branded ChromeOS. This version does not add keep alives for ChromeOS and was tested on the ChromeOS try bots. > > TBR=davemoore@chromium.org for the ash launcher test change. > > BUG=155457 > TEST=Make sure platform apps can be used from the launcher without chrome windows open; make sure Chrome shuts down properly in all cases. > > > Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=165772 > > Review URL: https://chromiumcodereview.appspot.com/11117011 TBR=benwells@chromium.org Review URL: https://codereview.chromium.org/11299326 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/system_indicator')
-rw-r--r--chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc
index 3fb2a00..446a576 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc
@@ -5,5 +5,5 @@
#include "chrome/browser/extensions/extension_apitest.h"
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SystemIndicator) {
- ASSERT_TRUE(RunPlatformAppTest("system_indicator/basics")) << message_;
+ ASSERT_TRUE(RunExtensionTest("system_indicator/basics")) << message_;
}