Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Unified Diff: ui/aura/window.h

Issue 8417008: aura: Add fullscreen/popups to RenderWidgetHostViewAura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/event_filter_unittest.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.h
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 8a9b0306e265862afb9eacfbfdd19926dd907736..33b4ae5f76e2921dcdafc4e086332d60bc209511 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_animator.h"
#include "ui/gfx/compositor/layer_delegate.h"
@@ -62,10 +63,10 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
void Init(ui::Layer::LayerType layer_type);
// 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; }
@@ -315,7 +316,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
virtual void OnLayerAnimationEnded(
const ui::LayerAnimationSequence* animation) OVERRIDE;
- int type_;
+ WindowType type_;
WindowDelegate* delegate_;
« no previous file with comments | « ui/aura/event_filter_unittest.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698