diff options
| author | xiyuan <xiyuan@chromium.org> | 2015-11-05 20:34:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-06 04:35:14 +0000 |
| commit | 3260ca01270439412a70ca368c8988ddae6ee268 (patch) | |
| tree | 4a32a568d6a00e6fbc02bb6b4909df04e04d3b13 /chrome/chrome_browser_chromeos.gypi | |
| parent | 059b808ec2c8a0a1be0fb53f71b93b9f60f90957 (diff) | |
| download | chromium_src-3260ca01270439412a70ca368c8988ddae6ee268.zip chromium_src-3260ca01270439412a70ca368c8988ddae6ee268.tar.gz chromium_src-3260ca01270439412a70ca368c8988ddae6ee268.tar.bz2 | |
kiosk: Restart on pepper flash crash/hung.
- Add KioskSessionPluginHandler to track plugin crash/hung for given
WebContents;
- Refactor app session lifetime code into a AppSession class;
- Wire GuestViewManager's guest content added event to AppSession;
- AppSession uses KioskSessionPluginHandler to track plugin crash/hungs
for WebViewGuest contents;
BUG=547966
Review URL: https://codereview.chromium.org/1412003008
Cr-Commit-Position: refs/heads/master@{#358256}
Diffstat (limited to 'chrome/chrome_browser_chromeos.gypi')
| -rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 01db708..f0d5bd6 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -19,8 +19,8 @@ 'browser/chromeos/accessibility/spoken_feedback_event_rewriter.h', 'browser/chromeos/app_mode/app_launch_utils.cc', 'browser/chromeos/app_mode/app_launch_utils.h', - 'browser/chromeos/app_mode/app_session_lifetime.cc', - 'browser/chromeos/app_mode/app_session_lifetime.h', + 'browser/chromeos/app_mode/app_session.cc', + 'browser/chromeos/app_mode/app_session.h', 'browser/chromeos/app_mode/certificate_manager_dialog.cc', 'browser/chromeos/app_mode/certificate_manager_dialog.h', 'browser/chromeos/app_mode/kiosk_app_data.cc', @@ -45,6 +45,9 @@ 'browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h', 'browser/chromeos/app_mode/kiosk_profile_loader.cc', 'browser/chromeos/app_mode/kiosk_profile_loader.h', + 'browser/chromeos/app_mode/kiosk_session_plugin_handler.cc', + 'browser/chromeos/app_mode/kiosk_session_plugin_handler.h', + 'browser/chromeos/app_mode/kiosk_session_plugin_handler_delegate.h', 'browser/chromeos/app_mode/startup_app_launcher.cc', 'browser/chromeos/app_mode/startup_app_launcher.h', 'browser/chromeos/attestation/attestation_ca_client.cc', |