Chromium Code Reviews| Index: ash/mus/bridge/wm_window_mus.h |
| diff --git a/ash/mus/bridge/wm_window_mus.h b/ash/mus/bridge/wm_window_mus.h |
| index 3e94c97661f1d370339a05b001fc92edaf10f25f..019e04c3aea5527ed2cb953a90300f8bc705e561 100644 |
| --- a/ash/mus/bridge/wm_window_mus.h |
| +++ b/ash/mus/bridge/wm_window_mus.h |
| @@ -27,6 +27,7 @@ namespace mus { |
| class MusLayoutManagerAdapter; |
| class WmRootWindowControllerMus; |
| +class WmWindowMusTestApi; |
| // WmWindow implementation for mus. |
| // |
| @@ -229,6 +230,8 @@ class WmWindowMus : public WmWindow, public ui::WindowObserver { |
| void RemoveLimitedPreTargetHandler(ui::EventHandler* handler) override; |
| private: |
| + friend class WmWindowMusTestApi; |
| + |
| // ui::WindowObserver: |
| void OnTreeChanging(const TreeChangeParams& params) override; |
| void OnTreeChanged(const TreeChangeParams& params) override; |
| @@ -278,6 +281,10 @@ class WmWindowMus : public WmWindow, public ui::WindowObserver { |
| base::ObserverList<WmTransientWindowObserver, true> transient_observers_; |
| + // If true the minimum size is 0x0, default is minimum size comes from widget. |
| + // Exists for tests. |
| + bool use_empty_minimum_size_ = false; |
|
James Cook
2016/08/09 00:37:10
optional nit: use_empty_minimum_size_for_testing_
sky
2016/08/09 13:16:48
Done.
|
| + |
| DISALLOW_COPY_AND_ASSIGN(WmWindowMus); |
| }; |