diff options
Diffstat (limited to 'chromium/ui/views/widget/widget.h')
| -rw-r--r-- | chromium/ui/views/widget/widget.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chromium/ui/views/widget/widget.h b/chromium/ui/views/widget/widget.h index 63fcb9d611e..6590ea90b80 100644 --- a/chromium/ui/views/widget/widget.h +++ b/chromium/ui/views/widget/widget.h @@ -109,7 +109,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, public FocusTraversable, public ui::NativeThemeObserver { public: - typedef std::set<Widget*> Widgets; + using Widgets = std::set<Widget*>; + using ShapeRects = std::vector<gfx::Rect>; enum FrameType { FRAME_TYPE_DEFAULT, // Use whatever the default would be. @@ -484,7 +485,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, // Sets a shape on the widget. Passing a NULL |shape| reverts the widget to // be rectangular. - void SetShape(std::unique_ptr<SkRegion> shape); + void SetShape(std::unique_ptr<ShapeRects> shape); // Hides the widget then closes it after a return to the message loop. virtual void Close(); @@ -641,10 +642,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, // changed. void ThemeChanged(); - // Notifies the view hierarchy contained in this widget that locale resources - // changed. - void LocaleChanged(); - // Notifies the view hierarchy contained in this widget that the device scale // factor changed. void DeviceScaleFactorChanged(float device_scale_factor); @@ -859,7 +856,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, private: friend class ComboboxTest; - friend class CustomButtonTest; + friend class ButtonTest; friend class TextfieldTest; friend class ViewAuraTest; |