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

Side by Side Diff: ui/aura/desktop.h

Issue 7970001: Better Z-index support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_AURA_DESKTOP_H_ 5 #ifndef UI_AURA_DESKTOP_H_
6 #define UI_AURA_DESKTOP_H_ 6 #define UI_AURA_DESKTOP_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 bool OnKeyEvent(const KeyEvent& event); 48 bool OnKeyEvent(const KeyEvent& event);
49 49
50 // Called when the host changes size. 50 // Called when the host changes size.
51 void OnHostResized(const gfx::Size& size); 51 void OnHostResized(const gfx::Size& size);
52 52
53 // Compositor we're drawing to. 53 // Compositor we're drawing to.
54 ui::Compositor* compositor() { return compositor_.get(); } 54 ui::Compositor* compositor() { return compositor_.get(); }
55 55
56 Window* window() { return window_.get(); } 56 Window* window() { return window_.get(); }
57 57
58 Window* toplevel_window_container() { return toplevel_window_container_; }
oshima 2011/09/20 05:29:28 () const {... same for getts above.
59 void set_toplevel_window_container(Window* toplevel_window_container) {
60 toplevel_window_container_ = toplevel_window_container;
61 }
62
58 static Desktop* GetInstance(); 63 static Desktop* GetInstance();
59 64
60 private: 65 private:
61 // Overridden from ui::CompositorDelegate 66 // Overridden from ui::CompositorDelegate
62 virtual void ScheduleCompositorPaint(); 67 virtual void ScheduleCompositorPaint();
63 68
64 scoped_refptr<ui::Compositor> compositor_; 69 scoped_refptr<ui::Compositor> compositor_;
65 70
66 scoped_ptr<internal::RootWindow> window_; 71 scoped_ptr<internal::RootWindow> window_;
72 Window* toplevel_window_container_;
67 73
68 scoped_ptr<DesktopHost> host_; 74 scoped_ptr<DesktopHost> host_;
69 75
70 static Desktop* instance_; 76 static Desktop* instance_;
71 77
72 // Used to schedule painting. 78 // Used to schedule painting.
73 ScopedRunnableMethodFactory<Desktop> schedule_paint_; 79 ScopedRunnableMethodFactory<Desktop> schedule_paint_;
74 80
75 DISALLOW_COPY_AND_ASSIGN(Desktop); 81 DISALLOW_COPY_AND_ASSIGN(Desktop);
76 }; 82 };
77 83
78 } // namespace aura 84 } // namespace aura
79 85
80 #endif // UI_AURA_DESKTOP_H_ 86 #endif // UI_AURA_DESKTOP_H_
OLDNEW
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/desktop.cc » ('j') | ui/aura/event_filter.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698