From bfa69d49b17f33635c79f79819b90a8d2089c4b3 Mon Sep 17 00:00:00 2001 From: "johnnyg@chromium.org" Date: Sat, 31 Oct 2009 03:27:19 +0000 Subject: Change notification cmd line enabling to use the new RuntimeEnabledFeatures code. BUG=25318 TEST=none Review URL: http://codereview.chromium.org/339093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30660 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/renderer_host/browser_render_process_host.cc | 1 + chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 2 -- chrome/common/render_messages.h | 4 +--- chrome/renderer/render_thread.cc | 6 ++++++ 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index dcdea78..38e163b 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -525,6 +525,7 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer( switches::kEnableDatabases, switches::kDisableByteRangeSupport, switches::kEnableWebSockets, + switches::kEnableDesktopNotifications, #if defined(OS_MACOSX) // Allow this to be set when invoking the browser and relayed along. switches::kEnableSandboxLogging, 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 a0b0c41..7dc7c2a 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -187,8 +187,6 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( command_line.HasSwitch(switches::kEnableSessionStorage); web_prefs.experimental_webgl_enabled = command_line.HasSwitch(switches::kEnableExperimentalWebGL); - web_prefs.experimental_notifications_enabled = - command_line.HasSwitch(switches::kEnableDesktopNotifications); } web_prefs.uses_universal_detector = diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 41486a0..a0d5eb8 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -1530,7 +1530,6 @@ struct ParamTraits { WriteParam(m, p.user_style_sheet_location); WriteParam(m, p.allow_universal_access_from_file_urls); WriteParam(m, p.experimental_webgl_enabled); - WriteParam(m, p.experimental_notifications_enabled); } static bool Read(const Message* m, void** iter, param_type* p) { return @@ -1569,8 +1568,7 @@ struct ParamTraits { ReadParam(m, iter, &p->user_style_sheet_enabled) && ReadParam(m, iter, &p->user_style_sheet_location) && ReadParam(m, iter, &p->allow_universal_access_from_file_urls) && - ReadParam(m, iter, &p->experimental_webgl_enabled) && - ReadParam(m, iter, &p->experimental_notifications_enabled); + ReadParam(m, iter, &p->experimental_webgl_enabled); } static void Log(const param_type& p, std::wstring* l) { l->append(L""); diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index c82b030..bd2d07a 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -528,6 +528,12 @@ void RenderThread::EnsureWebKitInitialized() { WebRuntimeFeatures::enableDatabase( command_line.HasSwitch(switches::kEnableDatabases)); + +#if defined(OS_WIN) + // We don't yet support notifications on non-Windows, so hide it from pages. + WebRuntimeFeatures::enableNotifications( + command_line.HasSwitch(switches::kEnableDesktopNotifications)); +#endif } void RenderThread::IdleHandler() { -- cgit v1.1