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

Unified Diff: ui/aura/window.cc

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/window.h ('k') | ui/aura/window_types.h » ('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 f13ce7cbca503893eeed78881f57d1e2b7a0e9dc..ec76fc73e7dec3d2de51b43dc87869fb3d06367c 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -25,7 +25,7 @@
namespace aura {
Window::Window(WindowDelegate* delegate)
- : type_(kWindowType_None),
+ : type_(WINDOW_TYPE_UNKNOWN),
delegate_(delegate),
show_state_(ui::SHOW_STATE_NORMAL),
parent_(NULL),
@@ -76,13 +76,11 @@ Window::~Window() {
void Window::Init(ui::Layer::LayerType layer_type) {
layer_.reset(new ui::Layer(Desktop::GetInstance()->compositor(), layer_type));
- // Windows (and therefore their layers) should initially be hidden, except for
- // controls.
- layer_->SetVisible(type_ == kWindowType_Control);
+ layer_->SetVisible(false);
layer_->set_delegate(this);
}
-void Window::SetType(int type) {
+void Window::SetType(WindowType type) {
// Cannot change type after the window is initialized.
DCHECK(!layer());
type_ = type;
« no previous file with comments | « ui/aura/window.h ('k') | ui/aura/window_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698