diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 23:28:26 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 23:28:26 +0000 |
| commit | de40134baeebb2428b11e7ea64d60f707cd23045 (patch) | |
| tree | 8db57df432ed8fd60a2bd07cb981d93554eb3c1f /ash/shell | |
| parent | 051ec4a92dc44356dbf55b568978ada2d056be85 (diff) | |
| download | chromium_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 'ash/shell')
| -rw-r--r-- | ash/shell/window_watcher.cc | 6 | ||||
| -rw-r--r-- | ash/shell/window_watcher.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index 44edaa4..55231cf 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc @@ -138,6 +138,9 @@ void WindowWatcher::OnWillRemoveWindow(aura::Window* window) { } } +void WindowWatcher::OnDisplayBoundsChanged(const gfx::Display& display) { +} + void WindowWatcher::OnDisplayAdded(const gfx::Display& new_display) { aura::Window* root = Shell::GetInstance()->display_controller()-> GetRootWindowForDisplayId(new_display.id()); @@ -149,8 +152,5 @@ void WindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) { // remove observers. } -void WindowWatcher::OnDisplayMetricsChanged(const gfx::Display&, uint32_t) { -} - } // namespace shell } // namespace ash diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h index 50cd9e4..2d94b77 100644 --- a/ash/shell/window_watcher.h +++ b/ash/shell/window_watcher.h @@ -38,10 +38,9 @@ class WindowWatcher : public aura::WindowObserver, virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; // gfx::DisplayObserver overrides: + virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; - virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; private: class WorkspaceWindowWatcher; |