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

Unified Diff: ui/views/widget/desktop_aura/desktop_root_window_host_x11.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_x11.h
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
index 8be42eea1406565207b255c141cced9f85285bed..b9f362976236bdde2384fe5354c7f6819c66d48e 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
@@ -127,7 +127,6 @@ class VIEWS_EXPORT DesktopRootWindowHostX11 :
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;
@@ -146,7 +145,6 @@ class VIEWS_EXPORT DesktopRootWindowHostX11 :
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;
@@ -255,7 +253,6 @@ private:
DesktopNativeWidgetAura* desktop_native_widget_aura_;
- aura::RootWindowHostDelegate* root_window_host_delegate_;
aura::Window* content_window_;
// We can optionally have a parent which can order us to close, or own

Powered by Google App Engine
This is Rietveld 408576698