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

Side by Side Diff: chrome/browser/guestview/webview/webview_guest.cc

Issue 58203002: Android: remove ContentViewCore from the renderer crash codepath. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « base/process/kill.h ('k') | content/browser/android/child_process_launcher_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/guestview/webview/webview_guest.h" 5 #include "chrome/browser/guestview/webview/webview_guest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 9 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
10 #include "chrome/browser/extensions/extension_renderer_state.h" 10 #include "chrome/browser/extensions/extension_renderer_state.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 static std::string TerminationStatusToString(base::TerminationStatus status) { 42 static std::string TerminationStatusToString(base::TerminationStatus status) {
43 switch (status) { 43 switch (status) {
44 case base::TERMINATION_STATUS_NORMAL_TERMINATION: 44 case base::TERMINATION_STATUS_NORMAL_TERMINATION:
45 return "normal"; 45 return "normal";
46 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION: 46 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION:
47 case base::TERMINATION_STATUS_STILL_RUNNING: 47 case base::TERMINATION_STATUS_STILL_RUNNING:
48 return "abnormal"; 48 return "abnormal";
49 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: 49 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
50 return "killed"; 50 return "killed";
51 case base::TERMINATION_STATUS_PROCESS_CRASHED: 51 case base::TERMINATION_STATUS_PROCESS_CRASHED:
52 #if defined(OS_ANDROID)
53 case base::TERMINATION_STATUS_OOM_PROTECTED:
54 #endif
52 return "crashed"; 55 return "crashed";
53 case base::TERMINATION_STATUS_MAX_ENUM: 56 case base::TERMINATION_STATUS_MAX_ENUM:
54 break; 57 break;
55 } 58 }
56 NOTREACHED() << "Unknown Termination Status."; 59 NOTREACHED() << "Unknown Termination Status.";
57 return "unknown"; 60 return "unknown";
58 } 61 }
59 62
60 static std::string PermissionTypeToString(BrowserPluginPermissionType type) { 63 static std::string PermissionTypeToString(BrowserPluginPermissionType type) {
61 switch (type) { 64 switch (type) {
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 593
591 WebViewGuest::PermissionResponseInfo::PermissionResponseInfo( 594 WebViewGuest::PermissionResponseInfo::PermissionResponseInfo(
592 const PermissionResponseCallback& callback, 595 const PermissionResponseCallback& callback,
593 bool allowed_by_default) 596 bool allowed_by_default)
594 : callback(callback), 597 : callback(callback),
595 allowed_by_default(allowed_by_default) { 598 allowed_by_default(allowed_by_default) {
596 } 599 }
597 600
598 WebViewGuest::PermissionResponseInfo::~PermissionResponseInfo() { 601 WebViewGuest::PermissionResponseInfo::~PermissionResponseInfo() {
599 } 602 }
OLDNEW
« no previous file with comments | « base/process/kill.h ('k') | content/browser/android/child_process_launcher_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698