summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 23:28:26 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 23:28:26 +0000
commitde40134baeebb2428b11e7ea64d60f707cd23045 (patch)
tree8db57df432ed8fd60a2bd07cb981d93554eb3c1f /chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc
parent051ec4a92dc44356dbf55b568978ada2d056be85 (diff)
downloadchromium_src-de40134baeebb2428b11e7ea64d60f707cd23045.zip
chromium_src-de40134baeebb2428b11e7ea64d60f707cd23045.tar.gz
chromium_src-de40134baeebb2428b11e7ea64d60f707cd23045.tar.bz2
Revert of Add OnDisplayMetricsChanged in DisplayObserver. (https://codereview.chromium.org/259253002/)
Reason for revert: Breaks DesktopScreenX11Test.RemoveMonitorOnRight and AddMonitorToTheRight on Linux Tests TBR=mlamouri@chromium.org NOTRY=true NOTREECHECKS=true http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Tests&number=11092 Original issue's description: > Add OnDisplayMetricsChanged in DisplayObserver. > > This replaces OnDisplayBoundsChanged and add a MetricsType > parameter so consumers can now which metrics has changed. The > current set of MetricsType include bounds, workarea and rotation. > > BUG=162827 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271768 Review URL: https://codereview.chromium.org/294963004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc')
-rw-r--r--chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc
index d7d5d92..c176b0b 100644
--- a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc
@@ -81,6 +81,10 @@ void DisplayOverscanHandler::RegisterMessages() {
base::Unretained(this)));
}
+void DisplayOverscanHandler::OnDisplayBoundsChanged(
+ const gfx::Display& display) {
+}
+
void DisplayOverscanHandler::OnDisplayAdded(const gfx::Display& new_display) {
web_ui()->CallJavascriptFunction(
"options.DisplayOverscan.onOverscanCanceled");
@@ -91,10 +95,6 @@ void DisplayOverscanHandler::OnDisplayRemoved(const gfx::Display& old_display) {
"options.DisplayOverscan.onOverscanCanceled");
}
-void DisplayOverscanHandler::OnDisplayMetricsChanged(const gfx::Display&,
- uint32_t) {
-}
-
void DisplayOverscanHandler::HandleStart(const base::ListValue* args) {
int64 display_id = gfx::Display::kInvalidDisplayID;
std::string id_value;