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

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

Issue 12342028: make menus, bubbles, etc. top level windows on aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fixes Created 7 years, 9 months 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 0ef05d57fee3960b19d1905ff74cc32de3e8bcf6..1b85a4484ff05dbbad43b81327089beee3134a34 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
@@ -47,6 +47,7 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
// Overridden from DesktopRootWindowHost:
virtual aura::RootWindow* Init(aura::Window* content_window,
const Widget::InitParams& params) OVERRIDE;
+ virtual void InitFocus(aura::Window* window) OVERRIDE;
virtual void Close() OVERRIDE;
virtual void CloseNow() OVERRIDE;
virtual aura::RootWindowHost* AsRootWindowHost() OVERRIDE;
@@ -124,6 +125,7 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void PrepareForShutdown() OVERRIDE;
+ virtual void SetHostWindowExpansion(const gfx::Rect& extra) OVERRIDE;
// Overridden from HWNDMessageHandlerDelegate:
virtual bool IsWidgetWindow() const OVERRIDE;
@@ -234,6 +236,12 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
scoped_ptr<DesktopDragDropClientWin> drag_drop_client_;
+ // Extra size added to the host window. Typically, the window size matches
+ // the contained content, however, when performing a translating or scaling
+ // animation the window has to be enlarged so that the content is not
+ // clipped.
+ gfx::Rect window_expansion_;
+
DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostWin);
};

Powered by Google App Engine
This is Rietveld 408576698