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

Unified Diff: chrome/browser/guest_view/web_view/web_view_guest.cc

Issue 332413003: Cleanup: Remove #ifdefs in extensions code that is disabled on mobile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/guest_view/web_view/web_view_guest.cc
diff --git a/chrome/browser/guest_view/web_view/web_view_guest.cc b/chrome/browser/guest_view/web_view/web_view_guest.cc
index a2a86a479c966c1a7c67715cdee83ee8d39f3cf0..00cdb48aef88140ca1d276df5528070263847fcd 100644
--- a/chrome/browser/guest_view/web_view/web_view_guest.cc
+++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
@@ -112,9 +112,6 @@ static std::string TerminationStatusToString(base::TerminationStatus status) {
case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
return "killed";
case base::TERMINATION_STATUS_PROCESS_CRASHED:
-#if defined(OS_ANDROID)
- case base::TERMINATION_STATUS_OOM_PROTECTED:
-#endif
return "crashed";
case base::TERMINATION_STATUS_MAX_ENUM:
break;
@@ -189,19 +186,19 @@ void AttachWebViewHelpers(WebContents* contents) {
WebViewGuest::WebViewGuest(int guest_instance_id,
WebContents* guest_web_contents,
const std::string& embedder_extension_id)
- : GuestView<WebViewGuest>(guest_instance_id,
- guest_web_contents,
- embedder_extension_id),
- script_executor_(new extensions::ScriptExecutor(guest_web_contents,
- &script_observers_)),
- pending_context_menu_request_id_(0),
- next_permission_request_id_(0),
- is_overriding_user_agent_(false),
- pending_reload_on_attachment_(false),
- main_frame_id_(0),
- chromevox_injected_(false),
- find_helper_(this),
- javascript_dialog_helper_(this) {
+ : GuestView<WebViewGuest>(guest_instance_id,
+ guest_web_contents,
+ embedder_extension_id),
+ script_executor_(new extensions::ScriptExecutor(guest_web_contents,
+ &script_observers_)),
+ pending_context_menu_request_id_(0),
+ next_permission_request_id_(0),
+ is_overriding_user_agent_(false),
+ pending_reload_on_attachment_(false),
+ main_frame_id_(0),
+ chromevox_injected_(false),
+ find_helper_(this),
+ javascript_dialog_helper_(this) {
notification_registrar_.Add(
this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
content::Source<WebContents>(guest_web_contents));

Powered by Google App Engine
This is Rietveld 408576698