| Index: views/widget/native_widget_aura.cc
|
| ===================================================================
|
| --- views/widget/native_widget_aura.cc (revision 110305)
|
| +++ views/widget/native_widget_aura.cc (working copy)
|
| @@ -132,7 +132,6 @@
|
| window_->Show();
|
|
|
| window_->layer()->SetFillsBoundsOpaquely(!params.transparent);
|
| - delegate_->OnNativeWidgetCreated();
|
| window_->set_minimum_size(delegate_->GetMinimumSize());
|
| window_->SetBounds(params.bounds);
|
| if (window_type == Widget::InitParams::TYPE_CONTROL) {
|
| @@ -147,8 +146,6 @@
|
| SetAlwaysOnTop(params.keep_on_top);
|
| window_->SetParent(NULL);
|
| }
|
| - // TODO(beng): do this some other way.
|
| - delegate_->OnNativeWidgetSizeChanged(params.bounds.size());
|
| can_activate_ = params.can_activate;
|
| if (params.type != Widget::InitParams::TYPE_TOOLTIP && !params.child) {
|
| DCHECK(GetWidget()->GetRootView());
|
| @@ -156,6 +153,9 @@
|
| GetWidget()->GetRootView());
|
| tooltip_manager_.reset(manager);
|
| }
|
| + delegate_->OnNativeWidgetCreated();
|
| + // TODO(beng): do this some other way.
|
| + delegate_->OnNativeWidgetSizeChanged(params.bounds.size());
|
| }
|
|
|
| NonClientFrameView* NativeWidgetAura::CreateNonClientFrameView() {
|
| @@ -311,8 +311,7 @@
|
| }
|
|
|
| void NativeWidgetAura::BecomeModal() {
|
| - // http://crbug.com/93936
|
| - NOTIMPLEMENTED();
|
| + window_->SetBoolProperty(aura::kModalKey, true);
|
| }
|
|
|
| gfx::Rect NativeWidgetAura::GetWindowScreenBounds() const {
|
| @@ -352,6 +351,8 @@
|
| void NativeWidgetAura::Close() {
|
| Hide();
|
|
|
| + window_->SetBoolProperty(aura::kModalKey, false);
|
| +
|
| if (!close_widget_factory_.HasWeakPtrs()) {
|
| MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
| @@ -412,7 +413,7 @@
|
| }
|
|
|
| void NativeWidgetAura::SetAlwaysOnTop(bool on_top) {
|
| - window_->SetIntProperty(aura::kAlwaysOnTopKey, on_top);
|
| + window_->SetBoolProperty(aura::kAlwaysOnTopKey, on_top);
|
| }
|
|
|
| void NativeWidgetAura::Maximize() {
|
|
|