Force databases and localstorage to be enabled extensions.

webkit/glue/webpreferences.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webpreferences.h"
 
 #include "base/string_util.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebSettings.h"
 #include "webkit/api/public/WebString.h"
@@ skipping 30 matching lines @@
   settings->setTextAreasAreResizable(text_areas_are_resizable);
   settings->setAllowScriptsToCloseWindows(allow_scripts_to_close_windows);
   if (user_style_sheet_enabled)
     settings->setUserStyleSheetLocation(user_style_sheet_location);
   else
     settings->setUserStyleSheetLocation(WebURL());
   settings->setUsesPageCache(uses_page_cache);
   settings->setDownloadableBinaryFontsEnabled(remote_fonts_enabled);
   settings->setXSSAuditorEnabled(xss_auditor_enabled);
   settings->setLocalStorageEnabled(local_storage_enabled);
+  settings->setDatabasesEnabled(WebKit::databasesEnabled() || databases_enabled);

[Erik does not do reviews, 2009/08/24 23:25:26]

80 cols

   settings->setSessionStorageEnabled(session_storage_enabled);
   settings->setOfflineWebApplicationCacheEnabled(application_cache_enabled);
 
   // This setting affects the behavior of links in an editable region:
   // clicking the link should select it rather than navigate to it.
   // Safari uses the same default. It is unlikley an embedder would want to
   // change this, since it would break existing rich text editors.
   settings->setEditableLinkBehaviorNeverLive();
 
   settings->setFontRenderingModeNormal();
   settings->setJavaEnabled(java_enabled);
 
   // Turn this on to cause WebCore to paint the resize corner for us.
   settings->setShouldPaintCustomScrollbars(true);
 
-  settings->setDatabasesEnabled(WebKit::databasesEnabled());
-
   // Mitigate attacks from local HTML files by not granting file:// URLs
   // universal access.
   settings->setAllowUniversalAccessFromFileURLs(false);
 
   // We prevent WebKit from checking if it needs to add a "text direction"
   // submenu to a context menu. it is not only because we don't need the result
   // but also because it cause a possible crash in Editor::hasBidiSelection().
   settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
 
   // Web inspector settings need to be passed in differently.
   web_view->SetInspectorSettings(inspector_settings);
 }