summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 21:14:36 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 21:14:36 +0000
commit2563936473f3959210f7908c30c82bf6ec25039e (patch)
treefba2297fe2a6457222f230c378141150e374693b
parentaec6ad64baed1efb092adcc53bf2a1473a584876 (diff)
downloadchromium_src-2563936473f3959210f7908c30c82bf6ec25039e.zip
chromium_src-2563936473f3959210f7908c30c82bf6ec25039e.tar.gz
chromium_src-2563936473f3959210f7908c30c82bf6ec25039e.tar.bz2
Force databases to be enabled when extensions are enabled so
that extension developers can beta-test databases. Review URL: http://codereview.chromium.org/160594 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22407 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/render_thread.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index f56a030..46711d4 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -384,7 +384,10 @@ void RenderThread::EnsureWebKitInitialized() {
if (RenderProcess::current()->initialized_media_library())
WebKit::enableMediaPlayer();
- if (command_line.HasSwitch(switches::kEnableDatabases)) {
+ // Note: We are forcing --enable-databases to on with --enable-extensions so
+ // that extension developers can test databases.
+ if (command_line.HasSwitch(switches::kEnableDatabases) ||
+ command_line.HasSwitch(switches::kEnableExtensions)) {
WebKit::enableDatabases();
}
}