diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-05 22:00:05 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-05 22:00:05 +0000 |
| commit | abf68099745ba6ac94a766ca948371a7f1d009d1 (patch) | |
| tree | 36338257f61a472ed8636daa2eba368e823f3605 /chrome/common/render_messages.h | |
| parent | b8d7cc09baa2fa0364df444ddd9b5d76085a4362 (diff) | |
| download | chromium_src-abf68099745ba6ac94a766ca948371a7f1d009d1.zip chromium_src-abf68099745ba6ac94a766ca948371a7f1d009d1.tar.gz chromium_src-abf68099745ba6ac94a766ca948371a7f1d009d1.tar.bz2 | |
Allow popups to close themselves with window.close().
This also fixes an issue where not all of the parts of WebPreferences were being serialized/deserialized across IPC.
BUG=23832
TEST=run set_page_color extension, when it sets the color, the popup
should close
Review URL: http://codereview.chromium.org/243096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/render_messages.h')
| -rw-r--r-- | chrome/common/render_messages.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index bd1b676..8ae3408 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -1641,8 +1641,7 @@ struct ParamTraits<WebPreferences> { WriteParam(m, p.uses_universal_detector); WriteParam(m, p.text_areas_are_resizable); WriteParam(m, p.java_enabled); - WriteParam(m, p.user_style_sheet_enabled); - WriteParam(m, p.user_style_sheet_location); + WriteParam(m, p.allow_scripts_to_close_windows); WriteParam(m, p.uses_page_cache); WriteParam(m, p.remote_fonts_enabled); WriteParam(m, p.xss_auditor_enabled); @@ -1650,6 +1649,10 @@ struct ParamTraits<WebPreferences> { WriteParam(m, p.databases_enabled); WriteParam(m, p.session_storage_enabled); WriteParam(m, p.application_cache_enabled); + WriteParam(m, p.tabs_to_links); + WriteParam(m, p.user_style_sheet_enabled); + 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); } @@ -1678,8 +1681,7 @@ struct ParamTraits<WebPreferences> { ReadParam(m, iter, &p->uses_universal_detector) && ReadParam(m, iter, &p->text_areas_are_resizable) && ReadParam(m, iter, &p->java_enabled) && - ReadParam(m, iter, &p->user_style_sheet_enabled) && - ReadParam(m, iter, &p->user_style_sheet_location) && + ReadParam(m, iter, &p->allow_scripts_to_close_windows) && ReadParam(m, iter, &p->uses_page_cache) && ReadParam(m, iter, &p->remote_fonts_enabled) && ReadParam(m, iter, &p->xss_auditor_enabled) && @@ -1687,7 +1689,11 @@ 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->tabs_to_links) && + 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); } static void Log(const param_type& p, std::wstring* l) { |