OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <vector> | 5 #include <vector> |
6 | 6 |
7 #include <X11/extensions/shape.h> | 7 #include <X11/extensions/shape.h> |
8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
9 | 9 |
10 // Get rid of X11 macros which conflict with gtest. | 10 // Get rid of X11 macros which conflict with gtest. |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 window_mask->lineTo(right - 10, 10); | 109 window_mask->lineTo(right - 10, 10); |
110 window_mask->lineTo(right - 10, 0); | 110 window_mask->lineTo(right - 10, 0); |
111 window_mask->close(); | 111 window_mask->close(); |
112 } | 112 } |
113 virtual void ResetWindowControls() OVERRIDE { | 113 virtual void ResetWindowControls() OVERRIDE { |
114 } | 114 } |
115 virtual void UpdateWindowIcon() OVERRIDE { | 115 virtual void UpdateWindowIcon() OVERRIDE { |
116 } | 116 } |
117 virtual void UpdateWindowTitle() OVERRIDE { | 117 virtual void UpdateWindowTitle() OVERRIDE { |
118 } | 118 } |
| 119 virtual void SizeConstraintsChanged() OVERRIDE { |
| 120 } |
119 | 121 |
120 private: | 122 private: |
121 DISALLOW_COPY_AND_ASSIGN(ShapedNonClientFrameView); | 123 DISALLOW_COPY_AND_ASSIGN(ShapedNonClientFrameView); |
122 }; | 124 }; |
123 | 125 |
124 class ShapedWidgetDelegate : public WidgetDelegateView { | 126 class ShapedWidgetDelegate : public WidgetDelegateView { |
125 public: | 127 public: |
126 ShapedWidgetDelegate() { | 128 ShapedWidgetDelegate() { |
127 } | 129 } |
128 | 130 |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 SubstructureRedirectMask | SubstructureNotifyMask, | 452 SubstructureRedirectMask | SubstructureNotifyMask, |
451 &xevent); | 453 &xevent); |
452 | 454 |
453 WMStateWaiter waiter(xid, "_NET_WM_STATE_FOCUSED", true); | 455 WMStateWaiter waiter(xid, "_NET_WM_STATE_FOCUSED", true); |
454 waiter.Wait(); | 456 waiter.Wait(); |
455 } | 457 } |
456 EXPECT_TRUE(widget.GetNativeWindow()->IsVisible()); | 458 EXPECT_TRUE(widget.GetNativeWindow()->IsVisible()); |
457 } | 459 } |
458 | 460 |
459 } // namespace views | 461 } // namespace views |
OLD | NEW |