summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-05 20:39:17 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-05 20:39:17 +0000
commite3c01687c706dd742f75c3404605124b0f2fbd89 (patch)
tree817e75dd3cd9c8cb9170507464e5f390fec8b33e /chrome
parentc99613d0bc1dd6d06839ac72e08a8f2dc6e7fa6b (diff)
downloadchromium_src-e3c01687c706dd742f75c3404605124b0f2fbd89.zip
chromium_src-e3c01687c706dd742f75c3404605124b0f2fbd89.tar.gz
chromium_src-e3c01687c706dd742f75c3404605124b0f2fbd89.tar.bz2
Adds command line flag to enable desktop notifications.
BUG=none TEST=none Review URL: http://codereview.chromium.org/249057/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc2
-rw-r--r--chrome/common/chrome_switches.cc4
-rw-r--r--chrome/common/chrome_switches.h2
-rw-r--r--chrome/common/render_messages.h4
4 files changed, 11 insertions, 1 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 bf5386e..a26a8d9 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -186,6 +186,8 @@ 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/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 1bbbf81..913d895 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -620,4 +620,8 @@ const wchar_t kActivateOnLaunch[] = L"activate-on-launch";
// Enable experimental WebGL support.
const wchar_t kEnableExperimentalWebGL[] = L"enable-webgl";
+// Enabled desktop notifications.
+const wchar_t kEnableDesktopNotifications[] =
+ L"enable-desktop-notifications";
+
} // namespace switches
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 19b9b06..802532f 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -250,6 +250,8 @@ extern const wchar_t kActivateOnLaunch[];
extern const wchar_t kEnableExperimentalWebGL[];
+extern const wchar_t kEnableDesktopNotifications[];
+
} // namespace switches
#endif // CHROME_COMMON_CHROME_SWITCHES_H_
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 1dfc4b9..bd1b676 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -1651,6 +1651,7 @@ struct ParamTraits<WebPreferences> {
WriteParam(m, p.session_storage_enabled);
WriteParam(m, p.application_cache_enabled);
WriteParam(m, p.experimental_webgl_enabled);
+ WriteParam(m, p.experimental_notifications_enabled);
}
static bool Read(const Message* m, void** iter, param_type* p) {
return
@@ -1686,7 +1687,8 @@ struct ParamTraits<WebPreferences> {
ReadParam(m, iter, &p->databases_enabled) &&
ReadParam(m, iter, &p->session_storage_enabled) &&
ReadParam(m, iter, &p->application_cache_enabled) &&
- ReadParam(m, iter, &p->experimental_webgl_enabled);
+ ReadParam(m, iter, &p->experimental_webgl_enabled) &&
+ ReadParam(m, iter, &p->experimental_notifications_enabled);
}
static void Log(const param_type& p, std::wstring* l) {
l->append(L"<WebPreferences>");