| 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 "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
| 10 #include "ui/aura/client/drag_drop_client.h" | 10 #include "ui/aura/client/drag_drop_client.h" |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 } | 347 } |
| 348 | 348 |
| 349 void NativeWidgetAura::SetBounds(const gfx::Rect& bounds) { | 349 void NativeWidgetAura::SetBounds(const gfx::Rect& bounds) { |
| 350 window_->SetBounds(bounds); | 350 window_->SetBounds(bounds); |
| 351 } | 351 } |
| 352 | 352 |
| 353 void NativeWidgetAura::SetSize(const gfx::Size& size) { | 353 void NativeWidgetAura::SetSize(const gfx::Size& size) { |
| 354 window_->SetBounds(gfx::Rect(window_->bounds().origin(), size)); | 354 window_->SetBounds(gfx::Rect(window_->bounds().origin(), size)); |
| 355 } | 355 } |
| 356 | 356 |
| 357 void NativeWidgetAura::MoveAbove(gfx::NativeView native_view) { | 357 void NativeWidgetAura::StackAbove(gfx::NativeView native_view) { |
| 358 if (window_->parent() && window_->parent() == native_view->parent()) | 358 if (window_->parent() && window_->parent() == native_view->parent()) |
| 359 window_->parent()->MoveChildAbove(window_, native_view); | 359 window_->parent()->StackChildAbove(window_, native_view); |
| 360 } | 360 } |
| 361 | 361 |
| 362 void NativeWidgetAura::MoveToTop() { | 362 void NativeWidgetAura::StackAtTop() { |
| 363 window_->parent()->MoveChildToFront(window_); | 363 window_->parent()->StackChildAtTop(window_); |
| 364 } | 364 } |
| 365 | 365 |
| 366 void NativeWidgetAura::SetShape(gfx::NativeRegion region) { | 366 void NativeWidgetAura::SetShape(gfx::NativeRegion region) { |
| 367 // No need for this. | 367 // No need for this. |
| 368 } | 368 } |
| 369 | 369 |
| 370 void NativeWidgetAura::Close() { | 370 void NativeWidgetAura::Close() { |
| 371 // |window_| may already be deleted by parent window. This can happen | 371 // |window_| may already be deleted by parent window. This can happen |
| 372 // when this widget is child widget or has transient parent | 372 // when this widget is child widget or has transient parent |
| 373 // and ownership is WIDGET_OWNS_NATIVE_WIDGET. | 373 // and ownership is WIDGET_OWNS_NATIVE_WIDGET. |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 791 NOTIMPLEMENTED(); | 791 NOTIMPLEMENTED(); |
| 792 } | 792 } |
| 793 | 793 |
| 794 // static | 794 // static |
| 795 bool NativeWidgetPrivate::IsMouseButtonDown() { | 795 bool NativeWidgetPrivate::IsMouseButtonDown() { |
| 796 return aura::Desktop::GetInstance()->IsMouseButtonDown(); | 796 return aura::Desktop::GetInstance()->IsMouseButtonDown(); |
| 797 } | 797 } |
| 798 | 798 |
| 799 } // namespace internal | 799 } // namespace internal |
| 800 } // namespace views | 800 } // namespace views |
| OLD | NEW |