summaryrefslogtreecommitdiffstats
path: root/extensions/browser/guest_view
diff options
context:
space:
mode:
authormoshayedi <moshayedi@chromium.org>2015-11-17 06:57:17 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-17 14:57:54 +0000
commit23ae24f61bdb3945ffb3ef55e26de209d08cecf1 (patch)
tree44d874eb63d97a477e958e16fdcc33957185e00d /extensions/browser/guest_view
parent90d2c80a6ac547c5a9017e3870b21c69f4285557 (diff)
downloadchromium_src-23ae24f61bdb3945ffb3ef55e26de209d08cecf1.zip
chromium_src-23ae24f61bdb3945ffb3ef55e26de209d08cecf1.tar.gz
chromium_src-23ae24f61bdb3945ffb3ef55e26de209d08cecf1.tar.bz2
Aura on Android: build gn target extensions/browser.
Changes necessary to get extensions/browser build on Android when using use_aura=true. Most of these changes are because we don't have USB support for Aura on Android yet. This is a prerequisite for building the "extensions" target for Aura on Android. BUG=548797 Review URL: https://codereview.chromium.org/1416513006 Cr-Commit-Position: refs/heads/master@{#360073}
Diffstat (limited to 'extensions/browser/guest_view')
-rw-r--r--extensions/browser/guest_view/web_view/web_view_guest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index 4dedeee..1715b35 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -129,6 +129,9 @@ static std::string TerminationStatusToString(base::TerminationStatus status) {
#endif
case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
return "killed";
+#if defined(OS_ANDROID)
+ case base::TERMINATION_STATUS_OOM_PROTECTED:
+#endif
case base::TERMINATION_STATUS_PROCESS_CRASHED:
return "crashed";
case base::TERMINATION_STATUS_LAUNCH_FAILED: