Chromium Code Reviews| Index: ui/aura/window.h |
| diff --git a/ui/aura/window.h b/ui/aura/window.h |
| index 9820b29880da8de71d0798c317d6c83aeb9f17d5..68952678a648e1a79ea2304c9bcf02c2bdbc6a83 100644 |
| --- a/ui/aura/window.h |
| +++ b/ui/aura/window.h |
| @@ -119,6 +119,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate { |
| // the desktop's window. |
| void SetParent(Window* parent); |
| Window* parent() { return parent_; } |
| + const Window* parent() const { return parent_; } |
| // Move the specified child of this Window to the front of the z-order. |
| // TODO(beng): this is (obviously) feeble. |
| @@ -211,7 +212,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate { |
| // should use this. Caller owns returned value. |
| static ui::Animation* CreateDefaultAnimation(); |
| - protected: |
| +protected: |
|
Ben Goodger (Google)
2011/10/13 03:03:39
don't change this
|
| // Returns the RootWindow or NULL if we don't yet have a RootWindow. |
| virtual internal::RootWindow* GetRoot(); |