Index: mash/wm/bridge/wm_window_mus.h |
diff --git a/mash/wm/bridge/wm_window_mus.h b/mash/wm/bridge/wm_window_mus.h |
index 05c649e1389ec436471aa5ef6071df66800d0c7f..6bb0dbfc0f309565a0cfba75c89a342b8305dff7 100644 |
--- a/mash/wm/bridge/wm_window_mus.h |
+++ b/mash/wm/bridge/wm_window_mus.h |
@@ -97,10 +97,14 @@ class WmWindowMus : public ash::wm::WmWindow, public mus::WindowObserver { |
return ash::wm::WmWindow::GetWindowState(); |
} |
+ // See description of |children_use_extended_hit_region_|. |
+ bool ShouldUseExtendedHitRegion() const; |
+ |
// WmWindow: |
const ash::wm::WmWindow* GetRootWindow() const override; |
ash::wm::WmRootWindowController* GetRootWindowController() override; |
ash::wm::WmGlobals* GetGlobals() const override; |
+ void SetName(const char* name) override; |
base::string16 GetTitle() const override; |
void SetShellWindowId(int id) override; |
int GetShellWindowId() const override; |
@@ -145,6 +149,8 @@ class WmWindowMus : public ash::wm::WmWindow, public mus::WindowObserver { |
void Animate(::wm::WindowAnimationType type) override; |
void StopAnimatingProperty( |
ui::LayerAnimationElement::AnimatableProperty property) override; |
+ void SetChildWindowVisibilityChangesAnimated() override; |
+ void SetMasksToBounds(bool value) override; |
void SetBounds(const gfx::Rect& bounds) override; |
void SetBoundsWithTransitionDelay(const gfx::Rect& bounds, |
base::TimeDelta delta) override; |
@@ -194,7 +200,12 @@ class WmWindowMus : public ash::wm::WmWindow, public mus::WindowObserver { |
std::vector<ash::wm::WmWindow*> GetChildren() override; |
void ShowResizeShadow(int component) override; |
void HideResizeShadow() override; |
+ void SetBoundsInScreenBehaviorForChildren( |
+ BoundsInScreenBehavior behavior) override; |
+ void SetSnapsChildrenToPhysicalPixelBoundary() override; |
void SnapToPixelBoundaryIfNecessary() override; |
+ void SetChildrenUseExtendedHitRegion() override; |
+ void SetDescendantsStayInSameRootWindow(bool value) override; |
void AddObserver(ash::wm::WmWindowObserver* observer) override; |
void RemoveObserver(ash::wm::WmWindowObserver* observer) override; |
@@ -234,6 +245,12 @@ class WmWindowMus : public ash::wm::WmWindow, public mus::WindowObserver { |
ui::WindowShowState restore_show_state_ = ui::SHOW_STATE_DEFAULT; |
+ bool snap_children_to_pixel_boundary_ = false; |
+ |
+ // If true child windows should get a slightly larger hit region to make |
+ // resizing easier. |
+ bool children_use_extended_hit_region_ = false; |
+ |
DISALLOW_COPY_AND_ASSIGN(WmWindowMus); |
}; |