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-25 08:52:47 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 08:52:47 +0000
commitfa1b5dace74e745d2484012f98559d69825078f5 (patch)
treee25b919f546afd26209ac1a8351362571c2f30bf /chrome/browser/tab_contents
parenta84d37604865e6d46dbbcf43af5f974e687f55a9 (diff)
downloadchromium_src-fa1b5dace74e745d2484012f98559d69825078f5.zip
chromium_src-fa1b5dace74e745d2484012f98559d69825078f5.tar.gz
chromium_src-fa1b5dace74e745d2484012f98559d69825078f5.tar.bz2
Revert r24223. Storage test is not working.
TBR=mpcomplete@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24226 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, 5 insertions, 3 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 184fc5e..5146caf 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -179,10 +179,12 @@ 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);
- web_prefs.databases_enabled =
- command_line.HasSwitch(switches::kEnableDatabases);
+ command_line.HasSwitch(switches::kEnableLocalStorage) ||
+ command_line.HasSwitch(switches::kEnableExtensions);
web_prefs.session_storage_enabled =
command_line.HasSwitch(switches::kEnableSessionStorage);
}