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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
367 void NativeWidgetAura::EnableClose(bool enable) { | 367 void NativeWidgetAura::EnableClose(bool enable) { |
368 // http://crbug.com/102581 | 368 // http://crbug.com/102581 |
369 NOTIMPLEMENTED(); | 369 NOTIMPLEMENTED(); |
370 } | 370 } |
371 | 371 |
372 void NativeWidgetAura::Show() { | 372 void NativeWidgetAura::Show() { |
373 ShowWithWindowState(ui::SHOW_STATE_INACTIVE); | 373 ShowWithWindowState(ui::SHOW_STATE_INACTIVE); |
374 } | 374 } |
375 | 375 |
376 void NativeWidgetAura::Hide() { | 376 void NativeWidgetAura::Hide() { |
377 window_->Hide(); | 377 // |window_| may already be deleted by parent window. |
378 if (window_) | |
Ben Goodger (Google)
2011/11/16 15:48:25
This seems kind of random. What other functions in
oshima
2011/11/16 16:51:47
On second thought, I think I should move this to C
| |
379 window_->Hide(); | |
378 } | 380 } |
379 | 381 |
380 void NativeWidgetAura::ShowMaximizedWithBounds( | 382 void NativeWidgetAura::ShowMaximizedWithBounds( |
381 const gfx::Rect& restored_bounds) { | 383 const gfx::Rect& restored_bounds) { |
382 window_->SetBounds(restored_bounds); | 384 window_->SetBounds(restored_bounds); |
383 ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED); | 385 ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED); |
384 } | 386 } |
385 | 387 |
386 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) { | 388 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) { |
387 if (state == ui::SHOW_STATE_MAXIMIZED || | 389 if (state == ui::SHOW_STATE_MAXIMIZED || |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
722 NOTIMPLEMENTED(); | 724 NOTIMPLEMENTED(); |
723 } | 725 } |
724 | 726 |
725 // static | 727 // static |
726 bool NativeWidgetPrivate::IsMouseButtonDown() { | 728 bool NativeWidgetPrivate::IsMouseButtonDown() { |
727 return aura::Desktop::GetInstance()->IsMouseButtonDown(); | 729 return aura::Desktop::GetInstance()->IsMouseButtonDown(); |
728 } | 730 } |
729 | 731 |
730 } // namespace internal | 732 } // namespace internal |
731 } // namespace views | 733 } // namespace views |
OLD | NEW |