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

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

Issue 363483002: Reenable PanelViewTest.CheckTitleOnlyHeight and PanelViewTest.CheckMinimizedHeight (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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_window_tree_host_x11.h
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
index cbcd9fc0e1f1dce3f27ab1fe69eedaee895b7df0..d53eeb1ebb3846f1d709942d66ecb018c59c5fac 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -17,6 +17,7 @@
#include "ui/events/platform/platform_event_dispatcher.h"
#include "ui/gfx/insets.h"
#include "ui/gfx/rect.h"
+#include "ui/gfx/size.h"
#include "ui/gfx/x/x11_atom_cache.h"
#include "ui/views/views_export.h"
#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
@@ -140,7 +141,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
const gfx::ImageSkia& app_icon) OVERRIDE;
virtual void InitModalType(ui::ModalType modal_type) OVERRIDE;
virtual void FlashFrame(bool flash_frame) OVERRIDE;
- virtual void OnRootViewLayout() const OVERRIDE;
+ virtual void OnRootViewLayout() OVERRIDE;
virtual void OnNativeWidgetFocus() OVERRIDE;
virtual void OnNativeWidgetBlur() OVERRIDE;
virtual bool IsAnimatingClosed() const OVERRIDE;
@@ -179,6 +180,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// Called when |xwindow_|'s _NET_FRAME_EXTENTS property is updated.
void OnFrameExtentsUpdated();
+ // Updates |xwindow_|'s minimum and maximum size.
+ void UpdateMinAndMaxSize();
+
// Updates |xwindow_|'s _NET_WM_USER_TIME if |xwindow_| is active.
void UpdateWMUserTime(const ui::PlatformEvent& event);
@@ -261,6 +265,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// The bounds of our window before we were maximized.
gfx::Rect restored_bounds_;
+ // |xwindow_|'s minimum size.
+ gfx::Size min_size_;
+
+ // |xwindow_|'s maximum size.
+ gfx::Size max_size_;
+
// The window manager state bits.
std::set< ::Atom> window_properties_;

Powered by Google App Engine
This is Rietveld 408576698