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

Unified Diff: ui/aura/window.cc

Issue 10412044: layers: Consolidate the ownership of layers in views::View and aura::Window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/window.h ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 1bdd6c72facd5324f2aaa4a0dc4cfac82930df0c..d5ad4acc32ba5e786a7cacb12b744a24ece1948a 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -50,7 +50,6 @@ Window::Window(WindowDelegate* delegate)
: type_(client::WINDOW_TYPE_UNKNOWN),
owned_by_parent_(true),
delegate_(delegate),
- layer_(NULL),
parent_(NULL),
transient_parent_(NULL),
visible_(false),
@@ -166,10 +165,6 @@ void Window::SetTransparent(bool transparent) {
transparent_ = transparent;
}
-ui::Layer* Window::AcquireLayer() {
- return layer_owner_.release();
-}
-
RootWindow* Window::GetRootWindow() {
return const_cast<RootWindow*>(
static_cast<const Window*>(this)->GetRootWindow());
« no previous file with comments | « ui/aura/window.h ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698