Commit 8709371a authored by sadrul@chromium.org's avatar sadrul@chromium.org

aura: Remove WindowTreeHost::OnDeviceScaleFactorChanged.

None of the implementations if WindowTreeHosts do anything when
the device-scale factor changes. So remove it.

BUG=none
R=sky@chromium.org

Review URL: https://codereview.chromium.org/389663003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282799 0039d316-1c4b-4281-b951-d872f2087c98
parent 2b74405f
...@@ -137,11 +137,6 @@ void WindowTreeHostMojo::PostNativeEvent( ...@@ -137,11 +137,6 @@ void WindowTreeHostMojo::PostNativeEvent(
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
void WindowTreeHostMojo::OnDeviceScaleFactorChanged(
float device_scale_factor) {
NOTIMPLEMENTED();
}
void WindowTreeHostMojo::SetCursorNative(gfx::NativeCursor cursor) { void WindowTreeHostMojo::SetCursorNative(gfx::NativeCursor cursor) {
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
......
...@@ -53,7 +53,6 @@ class WindowTreeHostMojo : public aura::WindowTreeHost, ...@@ -53,7 +53,6 @@ class WindowTreeHostMojo : public aura::WindowTreeHost,
virtual void SetCapture() OVERRIDE; virtual void SetCapture() OVERRIDE;
virtual void ReleaseCapture() OVERRIDE; virtual void ReleaseCapture() OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE;
virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;
virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
......
...@@ -144,10 +144,6 @@ void WindowTreeHostImpl::PostNativeEvent( ...@@ -144,10 +144,6 @@ void WindowTreeHostImpl::PostNativeEvent(
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
void WindowTreeHostImpl::OnDeviceScaleFactorChanged(float device_scale_factor) {
NOTIMPLEMENTED();
}
void WindowTreeHostImpl::SetCursorNative(gfx::NativeCursor cursor) { void WindowTreeHostImpl::SetCursorNative(gfx::NativeCursor cursor) {
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
......
...@@ -46,7 +46,6 @@ class WindowTreeHostImpl : public aura::WindowTreeHost, ...@@ -46,7 +46,6 @@ class WindowTreeHostImpl : public aura::WindowTreeHost,
virtual void SetCapture() OVERRIDE; virtual void SetCapture() OVERRIDE;
virtual void ReleaseCapture() OVERRIDE; virtual void ReleaseCapture() OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE;
virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;
virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
......
...@@ -275,11 +275,6 @@ void RemoteWindowTreeHostWin::PostNativeEvent( ...@@ -275,11 +275,6 @@ void RemoteWindowTreeHostWin::PostNativeEvent(
const base::NativeEvent& native_event) { const base::NativeEvent& native_event) {
} }
void RemoteWindowTreeHostWin::OnDeviceScaleFactorChanged(
float device_scale_factor) {
NOTIMPLEMENTED();
}
ui::EventProcessor* RemoteWindowTreeHostWin::GetEventProcessor() { ui::EventProcessor* RemoteWindowTreeHostWin::GetEventProcessor() {
return dispatcher(); return dispatcher();
} }
......
...@@ -126,7 +126,6 @@ class AURA_EXPORT RemoteWindowTreeHostWin ...@@ -126,7 +126,6 @@ class AURA_EXPORT RemoteWindowTreeHostWin
virtual void SetCapture() OVERRIDE; virtual void SetCapture() OVERRIDE;
virtual void ReleaseCapture() OVERRIDE; virtual void ReleaseCapture() OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE;
virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;
virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
......
...@@ -795,8 +795,6 @@ void* Window::GetNativeWindowProperty(const char* key) const { ...@@ -795,8 +795,6 @@ void* Window::GetNativeWindowProperty(const char* key) const {
void Window::OnDeviceScaleFactorChanged(float device_scale_factor) { void Window::OnDeviceScaleFactorChanged(float device_scale_factor) {
ScopedCursorHider hider(this); ScopedCursorHider hider(this);
if (IsRootWindow())
host_->OnDeviceScaleFactorChanged(device_scale_factor);
if (delegate_) if (delegate_)
delegate_->OnDeviceScaleFactorChanged(device_scale_factor); delegate_->OnDeviceScaleFactorChanged(device_scale_factor);
} }
......
...@@ -142,9 +142,6 @@ class AURA_EXPORT WindowTreeHost { ...@@ -142,9 +142,6 @@ class AURA_EXPORT WindowTreeHost {
// Posts |native_event| to the platform's event queue. // Posts |native_event| to the platform's event queue.
virtual void PostNativeEvent(const base::NativeEvent& native_event) = 0; virtual void PostNativeEvent(const base::NativeEvent& native_event) = 0;
// Called when the device scale factor of the root window has chagned.
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) = 0;
protected: protected:
friend class TestScreen; // TODO(beng): see if we can remove/consolidate. friend class TestScreen; // TODO(beng): see if we can remove/consolidate.
......
...@@ -81,11 +81,6 @@ void WindowTreeHostOzone::PostNativeEvent( ...@@ -81,11 +81,6 @@ void WindowTreeHostOzone::PostNativeEvent(
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
void WindowTreeHostOzone::OnDeviceScaleFactorChanged(
float device_scale_factor) {
NOTIMPLEMENTED();
}
void WindowTreeHostOzone::SetCursorNative(gfx::NativeCursor cursor) { void WindowTreeHostOzone::SetCursorNative(gfx::NativeCursor cursor) {
ui::CursorFactoryOzone::GetInstance()->SetCursor(GetAcceleratedWidget(), ui::CursorFactoryOzone::GetInstance()->SetCursor(GetAcceleratedWidget(),
cursor.platform()); cursor.platform());
......
...@@ -39,7 +39,6 @@ class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost, ...@@ -39,7 +39,6 @@ class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,
virtual void SetCapture() OVERRIDE; virtual void SetCapture() OVERRIDE;
virtual void ReleaseCapture() OVERRIDE; virtual void ReleaseCapture() OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void SetCursorNative(gfx::NativeCursor cursor_type) OVERRIDE; virtual void SetCursorNative(gfx::NativeCursor cursor_type) OVERRIDE;
virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;
virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
......
...@@ -149,11 +149,6 @@ void WindowTreeHostWin::PostNativeEvent(const base::NativeEvent& native_event) { ...@@ -149,11 +149,6 @@ void WindowTreeHostWin::PostNativeEvent(const base::NativeEvent& native_event) {
hwnd(), native_event.message, native_event.wParam, native_event.lParam); hwnd(), native_event.message, native_event.wParam, native_event.lParam);
} }
void WindowTreeHostWin::OnDeviceScaleFactorChanged(
float device_scale_factor) {
NOTIMPLEMENTED();
}
ui::EventProcessor* WindowTreeHostWin::GetEventProcessor() { ui::EventProcessor* WindowTreeHostWin::GetEventProcessor() {
return dispatcher(); return dispatcher();
} }
......
...@@ -33,7 +33,6 @@ class AURA_EXPORT WindowTreeHostWin : public WindowTreeHost, ...@@ -33,7 +33,6 @@ class AURA_EXPORT WindowTreeHostWin : public WindowTreeHost,
virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;
virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
// ui::EventSource: // ui::EventSource:
virtual ui::EventProcessor* GetEventProcessor() OVERRIDE; virtual ui::EventProcessor* GetEventProcessor() OVERRIDE;
......
...@@ -606,10 +606,6 @@ void WindowTreeHostX11::PostNativeEvent( ...@@ -606,10 +606,6 @@ void WindowTreeHostX11::PostNativeEvent(
XFlush(xdisplay_); XFlush(xdisplay_);
} }
void WindowTreeHostX11::OnDeviceScaleFactorChanged(
float device_scale_factor) {
}
void WindowTreeHostX11::SetCursorNative(gfx::NativeCursor cursor) { void WindowTreeHostX11::SetCursorNative(gfx::NativeCursor cursor) {
if (cursor == current_cursor_) if (cursor == current_cursor_)
return; return;
......
...@@ -52,7 +52,6 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost, ...@@ -52,7 +52,6 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
virtual void SetCapture() OVERRIDE; virtual void SetCapture() OVERRIDE;
virtual void ReleaseCapture() OVERRIDE; virtual void ReleaseCapture() OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void SetCursorNative(gfx::NativeCursor cursor_type) OVERRIDE; virtual void SetCursorNative(gfx::NativeCursor cursor_type) OVERRIDE;
virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;
virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
......
...@@ -505,10 +505,6 @@ void DesktopWindowTreeHostWin::PostNativeEvent( ...@@ -505,10 +505,6 @@ void DesktopWindowTreeHostWin::PostNativeEvent(
const base::NativeEvent& native_event) { const base::NativeEvent& native_event) {
} }
void DesktopWindowTreeHostWin::OnDeviceScaleFactorChanged(
float device_scale_factor) {
}
void DesktopWindowTreeHostWin::SetCursorNative(gfx::NativeCursor cursor) { void DesktopWindowTreeHostWin::SetCursorNative(gfx::NativeCursor cursor) {
ui::CursorLoaderWin cursor_loader; ui::CursorLoaderWin cursor_loader;
cursor_loader.SetPlatformCursor(&cursor); cursor_loader.SetPlatformCursor(&cursor);
......
...@@ -115,7 +115,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin ...@@ -115,7 +115,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
virtual void SetCapture() OVERRIDE; virtual void SetCapture() OVERRIDE;
virtual void ReleaseCapture() OVERRIDE; virtual void ReleaseCapture() OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE;
virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;
......
...@@ -968,10 +968,6 @@ void DesktopWindowTreeHostX11::PostNativeEvent( ...@@ -968,10 +968,6 @@ void DesktopWindowTreeHostX11::PostNativeEvent(
XSendEvent(xdisplay_, xwindow_, False, 0, &xevent); XSendEvent(xdisplay_, xwindow_, False, 0, &xevent);
} }
void DesktopWindowTreeHostX11::OnDeviceScaleFactorChanged(
float device_scale_factor) {
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// DesktopWindowTreeHostX11, ui::EventSource implementation: // DesktopWindowTreeHostX11, ui::EventSource implementation:
......
...@@ -156,7 +156,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 ...@@ -156,7 +156,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
virtual void SetCapture() OVERRIDE; virtual void SetCapture() OVERRIDE;
virtual void ReleaseCapture() OVERRIDE; virtual void ReleaseCapture() OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE;
virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;
virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment