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

Unified Diff: ui/aura/window.h

Issue 8247012: Positions the launcher in the bottom left corner. Adds ShellDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix TestDesktopDelegate 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
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();

Powered by Google App Engine
This is Rietveld 408576698