Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: ui/views/widget/desktop_aura/desktop_root_window_host_win.h

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/widget/desktop_aura/desktop_root_window_host_win.h
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.h b/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
index 7b9f0132202365d17c4b598295dfb0e5b6a9f6a9..d9924c2b9b5050a23082425b9539cf9b7f9e58f2 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
@@ -103,7 +103,6 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
virtual bool IsAnimatingClosed() const OVERRIDE;
// Overridden from aura::RootWindowHost:
- virtual void SetDelegate(aura::RootWindowHostDelegate* delegate) OVERRIDE;
virtual aura::RootWindow* GetRootWindow() OVERRIDE;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
virtual void Show() OVERRIDE;
@@ -122,7 +121,6 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
virtual void UnConfineCursor() OVERRIDE;
virtual void OnCursorVisibilityChanged(bool show) OVERRIDE;
virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE;
- virtual void SetFocusWhenShown(bool focus_when_shown) OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void PrepareForShutdown() OVERRIDE;
@@ -232,7 +230,6 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
DesktopNativeWidgetAura* desktop_native_widget_aura_;
- aura::RootWindowHostDelegate* root_window_host_delegate_;
aura::Window* content_window_;
// Owned by DesktopNativeWidgetAura.

Powered by Google App Engine
This is Rietveld 408576698