summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-29 00:35:52 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-29 00:35:52 +0000
commit2f6a84d65c72e6fc4ff602523dda40aaa574a826 (patch)
tree9067d31dd3cc4e76d50f8dbf8db48a7da34e1ecf /chrome/browser/tab_contents
parent16aebd6af9a3d7b79241558e3d388833d859be25 (diff)
downloadchromium_src-2f6a84d65c72e6fc4ff602523dda40aaa574a826.zip
chromium_src-2f6a84d65c72e6fc4ff602523dda40aaa574a826.tar.gz
chromium_src-2f6a84d65c72e6fc4ff602523dda40aaa574a826.tar.bz2
Force databases and localstorage to be enabled extensions.
We were already doing this, this change modifies the mechanism. Before we were relying on the presence of the --enable-extensions flag, but as we are getting ready to remove that on dev, we needed something else. This forces local storage and database to be enabled on chrome-extension:// pages. Also, change the way database enabling works in general to be more like the way local storage works, just for consistency. Will remove old, unnecessary WebKit API in an upstream change. erikkay: extensions stuff dumi: database stuff jorlow: local storage stuff BUG=19511 Review URL: http://codereview.chromium.org/173306 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 5146caf..184fc5e 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -179,12 +179,10 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
web_prefs.application_cache_enabled =
command_line.HasSwitch(switches::kEnableApplicationCache);
- // NOTE: We imply local storage enabledness for extensions because the
- // extensions team is beta testing local storage and we like to live on the
- // edge.
web_prefs.local_storage_enabled =
- command_line.HasSwitch(switches::kEnableLocalStorage) ||
- command_line.HasSwitch(switches::kEnableExtensions);
+ command_line.HasSwitch(switches::kEnableLocalStorage);
+ web_prefs.databases_enabled =
+ command_line.HasSwitch(switches::kEnableDatabases);
web_prefs.session_storage_enabled =
command_line.HasSwitch(switches::kEnableSessionStorage);
}