summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 01:23:13 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 01:23:13 +0000
commit8ab0c328f2baf4774f8ca464a89e8ddeb4037e96 (patch)
tree6c93676d567cfe24541421e595656dccc36ed2be /chrome
parentee33950fa22a463c269fdff084968d05a8e67330 (diff)
downloadchromium_src-8ab0c328f2baf4774f8ca464a89e8ddeb4037e96.zip
chromium_src-8ab0c328f2baf4774f8ca464a89e8ddeb4037e96.tar.gz
chromium_src-8ab0c328f2baf4774f8ca464a89e8ddeb4037e96.tar.bz2
Revert 76324 - Build WebKit Full Screen API. Support is disabled by default; enable with --enable-fullscreen.
Commit after WK bug 44797 (r79774). BUG=16735 TEST=fullscreen layout tests. Review URL: http://codereview.chromium.org/6576004 TBR=ddorwin@chromium.org Review URL: http://codereview.chromium.org/6602023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc3
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h1
-rw-r--r--chrome/common/render_messages.cc4
4 files changed, 1 insertions, 10 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 ae98362..1acf625 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -307,9 +307,6 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
!command_line.HasSwitch(switches::kNoPings);
web_prefs.interactive_form_validation_enabled =
!command_line.HasSwitch(switches::kDisableInteractiveFormValidation);
- web_prefs.fullscreen_enabled =
- command_line.HasSwitch(switches::kEnableFullScreen);
-
// The user stylesheet watcher may not exist in a testing profile.
if (profile->GetUserStyleSheetWatcher()) {
web_prefs.user_style_sheet_enabled = true;
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index f033099..0d06d73 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -528,9 +528,6 @@ const char kEnableHistoryQuickProvider[] = "enable-history-quick-provider";
// Enable FileSystem API URLs.
const char kEnableFileSystemURLScheme[] = "enable-filesystem-url-scheme";
-// Enable the JavaScript Full Screen API.
-const char kEnableFullScreen[] = "enable-fullscreen";
-
// Enable the in-browser thumbnailing, which is more efficient than the
// in-renderer thumbnailing, as we can use more information to determine
// if we need to update thumbnails.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 9d7f108..c2626ab 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -157,7 +157,6 @@ extern const char kEnableExtensionTimelineApi[];
extern const char kEnableFastback[];
extern const char kEnableFileCookies[];
extern const char kEnableFileSystemURLScheme[];
-extern const char kEnableFullScreen[];
extern const char kEnableGPUPlugin[];
extern const char kEnableHistoryQuickProvider[];
extern const char kEnableInBrowserThumbnailing[];
diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
index a85ae5e..300106a 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -680,7 +680,6 @@ void ParamTraits<WebPreferences>::Write(Message* m, const param_type& p) {
WriteParam(m, p.accelerated_video_enabled);
WriteParam(m, p.memory_info_enabled);
WriteParam(m, p.interactive_form_validation_enabled);
- WriteParam(m, p.fullscreen_enabled);
}
bool ParamTraits<WebPreferences>::Read(const Message* m, void** iter,
@@ -737,8 +736,7 @@ bool ParamTraits<WebPreferences>::Read(const Message* m, void** iter,
ReadParam(m, iter, &p->accelerated_layers_enabled) &&
ReadParam(m, iter, &p->accelerated_video_enabled) &&
ReadParam(m, iter, &p->memory_info_enabled) &&
- ReadParam(m, iter, &p->interactive_form_validation_enabled) &&
- ReadParam(m, iter, &p->fullscreen_enabled);
+ ReadParam(m, iter, &p->interactive_form_validation_enabled);
}
void ParamTraits<WebPreferences>::Log(const param_type& p, std::string* l) {