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

Side by Side Diff: ui/views/widget/native_widget_aura.cc

Issue 9289036: aura: Add Layer::LAYER_SOLID_COLOR to compositor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update WorkspaceManagerTest Created 8 years, 10 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
« no previous file with comments | « ui/gfx/compositor/layer_unittest.cc ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "ui/views/widget/native_widget_aura.h" 5 #include "ui/views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "ui/aura/client/activation_client.h" 9 #include "ui/aura/client/activation_client.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 //////////////////////////////////////////////////////////////////////////////// 168 ////////////////////////////////////////////////////////////////////////////////
169 // NativeWidgetAura, internal::NativeWidgetPrivate implementation: 169 // NativeWidgetAura, internal::NativeWidgetPrivate implementation:
170 170
171 void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) { 171 void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) {
172 ownership_ = params.ownership; 172 ownership_ = params.ownership;
173 window_->set_user_data(this); 173 window_->set_user_data(this);
174 window_->SetType(GetAuraWindowTypeForWidgetType(params.type)); 174 window_->SetType(GetAuraWindowTypeForWidgetType(params.type));
175 window_->SetIntProperty(aura::client::kShowStateKey, params.show_state); 175 window_->SetIntProperty(aura::client::kShowStateKey, params.show_state);
176 window_->SetTransparent(params.transparent); 176 window_->SetTransparent(params.transparent);
177 window_->Init(params.create_texture_for_layer ? 177 window_->Init(params.create_texture_for_layer ?
178 ui::Layer::LAYER_HAS_TEXTURE : 178 ui::Layer::LAYER_TEXTURED :
179 ui::Layer::LAYER_HAS_NO_TEXTURE); 179 ui::Layer::LAYER_NOT_DRAWN);
180 if (params.type == Widget::InitParams::TYPE_CONTROL) 180 if (params.type == Widget::InitParams::TYPE_CONTROL)
181 window_->Show(); 181 window_->Show();
182 182
183 delegate_->OnNativeWidgetCreated(); 183 delegate_->OnNativeWidgetCreated();
184 if (params.child) { 184 if (params.child) {
185 window_->SetParent(params.GetParent()); 185 window_->SetParent(params.GetParent());
186 } else { 186 } else {
187 // Set up the transient child before the window is added. This way the 187 // Set up the transient child before the window is added. This way the
188 // LayoutManager knows the window has a transient parent. 188 // LayoutManager knows the window has a transient parent.
189 gfx::NativeView parent = params.GetParent(); 189 gfx::NativeView parent = params.GetParent();
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 } 883 }
884 } 884 }
885 885
886 // static 886 // static
887 bool NativeWidgetPrivate::IsMouseButtonDown() { 887 bool NativeWidgetPrivate::IsMouseButtonDown() {
888 return aura::RootWindow::GetInstance()->IsMouseButtonDown(); 888 return aura::RootWindow::GetInstance()->IsMouseButtonDown();
889 } 889 }
890 890
891 } // namespace internal 891 } // namespace internal
892 } // namespace views 892 } // namespace views
OLDNEW
« no previous file with comments | « ui/gfx/compositor/layer_unittest.cc ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698