diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:14:29 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:14:29 +0000 |
| commit | 3e14cad77812fbf6606d951b60eebd4f566680db (patch) | |
| tree | 8bd39772f6ae369e9ca282a750dd61b3e81e65d5 /ui/aura/window.h | |
| parent | 098b2911b28bbfabde8fe38cfa45f2d6c94e2c6e (diff) | |
| download | chromium_src-3e14cad77812fbf6606d951b60eebd4f566680db.zip chromium_src-3e14cad77812fbf6606d951b60eebd4f566680db.tar.gz chromium_src-3e14cad77812fbf6606d951b60eebd4f566680db.tar.bz2 | |
Shell related switches -> aura shell switches.
Aura client window properties->client namespace.
Move WindowType to client.
BUG=none
TEST=existing automation
TBR=sky
Review URL: http://codereview.chromium.org/8968022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window.h')
| -rw-r--r-- | ui/aura/window.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/aura/window.h b/ui/aura/window.h index dcd115d..a97194c 100644 --- a/ui/aura/window.h +++ b/ui/aura/window.h @@ -16,7 +16,7 @@ #include "base/string16.h" #include "ui/base/events.h" #include "ui/aura/aura_export.h" -#include "ui/aura/window_types.h" +#include "ui/aura/client/window_types.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/compositor/layer_animator.h" #include "ui/gfx/compositor/layer_delegate.h" @@ -57,8 +57,8 @@ class AURA_EXPORT Window : public ui::LayerDelegate { // A type is used to identify a class of Windows and customize behavior such // 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); + client::WindowType type() const { return type_; } + void SetType(client::WindowType type); int id() const { return id_; } void set_id(int id) { id_ = id; } @@ -298,7 +298,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate { // Updates the layer name with a name based on the window's name and id. void UpdateLayerName(const std::string& name); - WindowType type_; + client::WindowType type_; WindowDelegate* delegate_; |