| Index: ui/aura/window.h
|
| diff --git a/ui/aura/window.h b/ui/aura/window.h
|
| index daa8f06c54d361c91e33769869f85cd8fe11ba60..dbd7f304cb6ae665dafeca7cec0399ffafe90d96 100644
|
| --- a/ui/aura/window.h
|
| +++ b/ui/aura/window.h
|
| @@ -16,6 +16,7 @@
|
| #include "ui/base/events.h"
|
| #include "ui/base/ui_base_types.h"
|
| #include "ui/aura/aura_export.h"
|
| +#include "ui/aura/window_types.h"
|
| #include "ui/gfx/compositor/layer.h"
|
| #include "ui/gfx/compositor/layer_delegate.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| @@ -54,16 +55,23 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
|
| public:
|
| typedef std::vector<Window*> Windows;
|
|
|
| + // Parameter for Init() describing this Window's layer's initial state.
|
| + enum LayerInitialState {
|
| + LAYER_INITIALLY_VISIBLE = 0,
|
| + LAYER_INITIALLY_INVISIBLE
|
| + };
|
| +
|
| explicit Window(WindowDelegate* delegate);
|
| virtual ~Window();
|
|
|
| - void Init(ui::Layer::LayerType layer_type);
|
| + void Init(ui::Layer::LayerType layer_type,
|
| + LayerInitialState layer_state);
|
|
|
| // A type is used to identify a class of Windows and customize behavior such
|
| - // as event handling and parenting. The value can be any of those in
|
| - // window_types.h or a user defined value.
|
| - int type() const { return type_; }
|
| - void SetType(int type);
|
| + // as event handling and parenting. This field should only be consumed by the
|
| + // shell -- Aura itself shouldn't contain type-specific logic.
|
| + WindowType type() const { return type_; }
|
| + void SetType(WindowType type);
|
|
|
| int id() const { return id_; }
|
| void set_id(int id) { id_ = id; }
|
| @@ -311,7 +319,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
|
| virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
|
| virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE;
|
|
|
| - int type_;
|
| + WindowType type_;
|
|
|
| WindowDelegate* delegate_;
|
|
|
|
|