| Index: ash/frame/custom_frame_view_ash.h
|
| diff --git a/ash/frame/custom_frame_view_ash.h b/ash/frame/custom_frame_view_ash.h
|
| index d4822c676cde06190fa932cb85694ecbcdd2d58a..26337a225bacb04b2324ec55f1f06532a5766d11 100644
|
| --- a/ash/frame/custom_frame_view_ash.h
|
| +++ b/ash/frame/custom_frame_view_ash.h
|
| @@ -95,6 +95,7 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView {
|
| private:
|
| class OverlayView;
|
| friend class TestWidgetConstraintsDelegate;
|
| + friend class CustomFrameViewAshSizeLock;
|
|
|
| // views::NonClientFrameView:
|
| bool DoesIntersectRect(const views::View* target,
|
| @@ -117,6 +118,8 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView {
|
|
|
| ImmersiveFullscreenControllerDelegate* immersive_delegate_;
|
|
|
| + static bool use_empty_minimum_size_for_test_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
|
| };
|
|
|
|
|