| Index: ui/views/widget/widget.h
|
| diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
|
| index 0d383adc522fba0895a7d3c4ee7cdb1a7d88d776..9ade039d4a3c0e07813d7c0fceffde2d39a091c0 100644
|
| --- a/ui/views/widget/widget.h
|
| +++ b/ui/views/widget/widget.h
|
| @@ -162,6 +162,14 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
| TRANSLUCENT_WINDOW,
|
| };
|
|
|
| + enum Activatable {
|
| + // Infer whether the window should be activatable from the window type.
|
| + ACTIVATABLE_DEFAULT,
|
| +
|
| + ACTIVATABLE_YES,
|
| + ACTIVATABLE_NO
|
| + };
|
| +
|
| enum Ownership {
|
| // Default. Creator is not responsible for managing the lifetime of the
|
| // Widget, it is destroyed when the corresponding NativeWidget is
|
| @@ -187,7 +195,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
| // non-window widgets.
|
| WindowOpacity opacity;
|
| bool accept_events;
|
| - bool can_activate;
|
| + Activatable activatable;
|
| bool keep_on_top;
|
| bool visible_on_all_workspaces;
|
| Ownership ownership;
|
| @@ -874,6 +882,9 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
| // |saved_show_state_| is maximized.
|
| gfx::Rect initial_restored_bounds_;
|
|
|
| + // True if the widget can be activated.
|
| + bool can_activate_;
|
| +
|
| // Focus is automatically set to the view provided by the delegate
|
| // when the widget is shown. Set this value to false to override
|
| // initial focus for the widget.
|
|
|