|
Merge 166715 - Revert r165772: Keep browser process alive while there are platform apps with background pages running.
Change r165772 broke logout on official Chrome OS, such that Chrome
crashes every time you log out. This was caught by our bots which
immediately started failing every time, starting with r165772.
I tested this change on Chrome OS bots and confirmed that the
Chrome OS bots were fixed.
TBR=benwells@chromium.org
BUG= chromium:155457, chromium-os:36058
TEST=Run Chrome and Chrome OS trybots on several architectures. Verify
Chrome OS build is reliable now and that all Chrome browser tests still
pass.
Original CL description:
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.
Review URL: https://codereview.chromium.org/11275209
TBR=davidjames@google.com
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=166735
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+143 lines, -432 lines) |
Patch |
 |
M |
chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc
|
View
|
|
7 chunks |
+3 lines, -11 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/dns/dns_apitest.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/identity/identity_apitest.cc
|
View
|
|
13 chunks |
+0 lines, -13 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
|
View
|
|
1 chunk |
+4 lines, -6 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc
|
View
|
|
3 chunks |
+39 lines, -35 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/serial/serial_apitest.cc
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/socket/socket_apitest.cc
|
View
|
|
4 chunks |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
|
View
|
|
1 chunk |
+4 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/system_info_cpu/system_info_cpu_apitest.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/usb/usb_apitest.cc
|
View
|
|
3 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/extension_apitest.h
|
View
|
|
1 chunk |
+1 line, -7 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/extension_apitest.cc
|
View
|
|
2 chunks |
+1 line, -8 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/extension_browsertest.h
|
View
|
|
2 chunks |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/extension_browsertest.cc
|
View
|
|
4 chunks |
+0 lines, -33 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/extension_host.h
|
View
|
|
2 chunks |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/extension_host.cc
|
View
|
|
4 chunks |
+0 lines, -17 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/platform_app_browsertest.cc
|
View
|
|
24 chunks |
+36 lines, -40 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/platform_app_browsertest_util.h
|
View
|
|
2 chunks |
+3 lines, -12 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/platform_app_browsertest_util.cc
|
View
|
|
4 chunks |
+29 lines, -25 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/extensions/platform_app_service.h
|
View
|
|
1 chunk |
+0 lines, -35 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/extensions/platform_app_service.cc
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/extensions/platform_app_service_factory.h
|
View
|
|
1 chunk |
+0 lines, -36 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/extensions/platform_app_service_factory.cc
|
View
|
|
1 chunk |
+0 lines, -47 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/web_view_browsertest.cc
|
View
|
1
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/profiles/profile_dependency_manager.cc
|
View
|
|
2 chunks |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
|
View
|
|
15 chunks |
+11 lines, -18 lines |
0 comments
|
Download
|
 |
M |
chrome/chrome_browser_extensions.gypi
|
View
|
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/test/data/extensions/api_test/media_galleries_private/attachdetach/test.js
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
chrome/test/data/extensions/platform_apps/geometry/page1.js
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/test/data/extensions/platform_apps/open_link/main.js
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
Total messages: 2 (0 generated)
|