| OLD | NEW |
| 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 #include "views/widget/native_widget_aura.h" | 5 #include "views/widget/native_widget_aura.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "ui/aura/client/aura_constants.h" | 8 #include "ui/aura/client/aura_constants.h" |
| 9 #include "ui/aura/desktop.h" | 9 #include "ui/aura/desktop.h" |
| 10 #include "ui/aura/desktop_observer.h" | 10 #include "ui/aura/desktop_observer.h" |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 gfx::NativeWindow NativeWidgetAura::GetNativeWindow() const { | 194 gfx::NativeWindow NativeWidgetAura::GetNativeWindow() const { |
| 195 return window_; | 195 return window_; |
| 196 } | 196 } |
| 197 | 197 |
| 198 Widget* NativeWidgetAura::GetTopLevelWidget() { | 198 Widget* NativeWidgetAura::GetTopLevelWidget() { |
| 199 NativeWidgetPrivate* native_widget = GetTopLevelNativeWidget(GetNativeView()); | 199 NativeWidgetPrivate* native_widget = GetTopLevelNativeWidget(GetNativeView()); |
| 200 return native_widget ? native_widget->GetWidget() : NULL; | 200 return native_widget ? native_widget->GetWidget() : NULL; |
| 201 } | 201 } |
| 202 | 202 |
| 203 const ui::Compositor* NativeWidgetAura::GetCompositor() const { | 203 const ui::Compositor* NativeWidgetAura::GetCompositor() const { |
| 204 return window_->layer()->compositor(); | 204 return window_->layer()->GetCompositor(); |
| 205 } | 205 } |
| 206 | 206 |
| 207 ui::Compositor* NativeWidgetAura::GetCompositor() { | 207 ui::Compositor* NativeWidgetAura::GetCompositor() { |
| 208 return window_->layer()->compositor(); | 208 return window_->layer()->GetCompositor(); |
| 209 } | 209 } |
| 210 | 210 |
| 211 void NativeWidgetAura::CalculateOffsetToAncestorWithLayer( | 211 void NativeWidgetAura::CalculateOffsetToAncestorWithLayer( |
| 212 gfx::Point* offset, | 212 gfx::Point* offset, |
| 213 ui::Layer** layer_parent) { | 213 ui::Layer** layer_parent) { |
| 214 if (layer_parent) | 214 if (layer_parent) |
| 215 *layer_parent = window_->layer(); | 215 *layer_parent = window_->layer(); |
| 216 } | 216 } |
| 217 | 217 |
| 218 void NativeWidgetAura::ReorderLayers() { | 218 void NativeWidgetAura::ReorderLayers() { |
| (...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 722 NOTIMPLEMENTED(); | 722 NOTIMPLEMENTED(); |
| 723 } | 723 } |
| 724 | 724 |
| 725 // static | 725 // static |
| 726 bool NativeWidgetPrivate::IsMouseButtonDown() { | 726 bool NativeWidgetPrivate::IsMouseButtonDown() { |
| 727 return aura::Desktop::GetInstance()->IsMouseButtonDown(); | 727 return aura::Desktop::GetInstance()->IsMouseButtonDown(); |
| 728 } | 728 } |
| 729 | 729 |
| 730 } // namespace internal | 730 } // namespace internal |
| 731 } // namespace views | 731 } // namespace views |
| OLD | NEW |