Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / extension_webkit_preferences.cc

diff --git a/src/chrome/browser/extensions/extension_webkit_preferences.cc b/src/chrome/browser/extensions/extension_webkit_preferences.cc
index 0455227..73ce8c3 100644 (file)
--- a/src/chrome/browser/extensions/extension_webkit_preferences.cc
+++ b/src/chrome/browser/extensions/extension_webkit_preferences.cc
@@ -6,15 +6,15 @@
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
+#include "content/public/common/web_preferences.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
-#include "webkit/common/webpreferences.h"
 
 namespace extension_webkit_preferences {
 
 void SetPreferences(const extensions::Extension* extension,
                     extensions::ViewType render_view_type,
-                    WebPreferences* webkit_prefs) {
+                    content::WebPreferences* webkit_prefs) {
   if (!extension)
     return;
 
@@ -27,13 +27,6 @@ void SetPreferences(const extensions::Extension* extension,
     // Tabs aren't typically allowed to close windows. But extensions shouldn't
     // be subject to that.
     webkit_prefs->allow_scripts_to_close_windows = true;
-
-    // Disable gpu acceleration for extension background pages to avoid
-    // unecessarily creating a compositor context for them.
-    if (render_view_type == extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) {
-      webkit_prefs->accelerated_compositing_enabled = false;
-      webkit_prefs->force_compositing_mode = false;
-    }
   }
 
   if (extension->is_platform_app()) {