| OLD | NEW |
| 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/desktop_aura/desktop_native_widget_aura.h" | 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
| 10 #include "ui/aura/client/cursor_client.h" | 10 #include "ui/aura/client/cursor_client.h" |
| (...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 } | 567 } |
| 568 | 568 |
| 569 gfx::NativeView DesktopNativeWidgetAura::GetNativeView() const { | 569 gfx::NativeView DesktopNativeWidgetAura::GetNativeView() const { |
| 570 return content_window_; | 570 return content_window_; |
| 571 } | 571 } |
| 572 | 572 |
| 573 gfx::NativeWindow DesktopNativeWidgetAura::GetNativeWindow() const { | 573 gfx::NativeWindow DesktopNativeWidgetAura::GetNativeWindow() const { |
| 574 return content_window_; | 574 return content_window_; |
| 575 } | 575 } |
| 576 | 576 |
| 577 gfx::NativeViewAccessible NativeWidgetMac::GetNativeViewAccessible() const { |
| 578 NOTIMPLEMENTED(); |
| 579 return NULL; |
| 580 } |
| 581 |
| 577 Widget* DesktopNativeWidgetAura::GetTopLevelWidget() { | 582 Widget* DesktopNativeWidgetAura::GetTopLevelWidget() { |
| 578 return GetWidget(); | 583 return GetWidget(); |
| 579 } | 584 } |
| 580 | 585 |
| 581 const ui::Compositor* DesktopNativeWidgetAura::GetCompositor() const { | 586 const ui::Compositor* DesktopNativeWidgetAura::GetCompositor() const { |
| 582 return content_window_ ? content_window_->layer()->GetCompositor() : NULL; | 587 return content_window_ ? content_window_->layer()->GetCompositor() : NULL; |
| 583 } | 588 } |
| 584 | 589 |
| 585 ui::Compositor* DesktopNativeWidgetAura::GetCompositor() { | 590 ui::Compositor* DesktopNativeWidgetAura::GetCompositor() { |
| 586 return const_cast<ui::Compositor*>( | 591 return const_cast<ui::Compositor*>( |
| (...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1213 if (cursor_reference_count_ == 0) { | 1218 if (cursor_reference_count_ == 0) { |
| 1214 // We are the last DesktopNativeWidgetAura instance, and we are responsible | 1219 // We are the last DesktopNativeWidgetAura instance, and we are responsible |
| 1215 // for cleaning up |cursor_manager_|. | 1220 // for cleaning up |cursor_manager_|. |
| 1216 delete cursor_manager_; | 1221 delete cursor_manager_; |
| 1217 native_cursor_manager_ = NULL; | 1222 native_cursor_manager_ = NULL; |
| 1218 cursor_manager_ = NULL; | 1223 cursor_manager_ = NULL; |
| 1219 } | 1224 } |
| 1220 } | 1225 } |
| 1221 | 1226 |
| 1222 } // namespace views | 1227 } // namespace views |
| OLD | NEW |