OLD | NEW |
---|---|
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 "chrome/browser/extensions/api/web_request/web_request_api.h" | 8 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
9 #include "chrome/browser/extensions/extension_renderer_state.h" | 9 #include "chrome/browser/extensions/extension_renderer_state.h" |
10 #include "chrome/browser/extensions/extension_web_contents_observer.h" | 10 #include "chrome/browser/extensions/extension_web_contents_observer.h" |
(...skipping 29 matching lines...) Expand all Loading... | |
40 static std::string TerminationStatusToString(base::TerminationStatus status) { | 40 static std::string TerminationStatusToString(base::TerminationStatus status) { |
41 switch (status) { | 41 switch (status) { |
42 case base::TERMINATION_STATUS_NORMAL_TERMINATION: | 42 case base::TERMINATION_STATUS_NORMAL_TERMINATION: |
43 return "normal"; | 43 return "normal"; |
44 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION: | 44 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION: |
45 case base::TERMINATION_STATUS_STILL_RUNNING: | 45 case base::TERMINATION_STATUS_STILL_RUNNING: |
46 return "abnormal"; | 46 return "abnormal"; |
47 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: | 47 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: |
48 return "killed"; | 48 return "killed"; |
49 case base::TERMINATION_STATUS_PROCESS_CRASHED: | 49 case base::TERMINATION_STATUS_PROCESS_CRASHED: |
50 case base::TERMINATION_STATUS_OOM_PROTECTED: | |
Yaron
2013/11/05 01:48:43
#if defined(OS_ANDROID)
wouldn't compile otherwi
ppi
2013/11/05 13:58:18
Done (yup, this is http://developer.chrome.com/app
| |
50 return "crashed"; | 51 return "crashed"; |
51 case base::TERMINATION_STATUS_MAX_ENUM: | 52 case base::TERMINATION_STATUS_MAX_ENUM: |
52 break; | 53 break; |
53 } | 54 } |
54 NOTREACHED() << "Unknown Termination Status."; | 55 NOTREACHED() << "Unknown Termination Status."; |
55 return "unknown"; | 56 return "unknown"; |
56 } | 57 } |
57 | 58 |
58 static std::string PermissionTypeToString(BrowserPluginPermissionType type) { | 59 static std::string PermissionTypeToString(BrowserPluginPermissionType type) { |
59 switch (type) { | 60 switch (type) { |
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
568 | 569 |
569 WebViewGuest::PermissionResponseInfo::PermissionResponseInfo( | 570 WebViewGuest::PermissionResponseInfo::PermissionResponseInfo( |
570 const PermissionResponseCallback& callback, | 571 const PermissionResponseCallback& callback, |
571 bool allowed_by_default) | 572 bool allowed_by_default) |
572 : callback(callback), | 573 : callback(callback), |
573 allowed_by_default(allowed_by_default) { | 574 allowed_by_default(allowed_by_default) { |
574 } | 575 } |
575 | 576 |
576 WebViewGuest::PermissionResponseInfo::~PermissionResponseInfo() { | 577 WebViewGuest::PermissionResponseInfo::~PermissionResponseInfo() { |
577 } | 578 } |
OLD | NEW |