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/native_widget_aura.h" | 5 #include "ui/views/widget/native_widget_aura.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "third_party/skia/include/core/SkRegion.h" | 9 #include "third_party/skia/include/core/SkRegion.h" |
10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
477 void NativeWidgetAura::ShowMaximizedWithBounds( | 477 void NativeWidgetAura::ShowMaximizedWithBounds( |
478 const gfx::Rect& restored_bounds) { | 478 const gfx::Rect& restored_bounds) { |
479 SetRestoreBounds(window_, restored_bounds); | 479 SetRestoreBounds(window_, restored_bounds); |
480 ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED); | 480 ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED); |
481 } | 481 } |
482 | 482 |
483 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) { | 483 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) { |
484 if (!window_) | 484 if (!window_) |
485 return; | 485 return; |
486 | 486 |
487 if (state == ui::SHOW_STATE_MAXIMIZED || state == ui::SHOW_STATE_FULLSCREEN) | 487 window_->SetProperty(aura::client::kShowStateKey, state); |
488 window_->SetProperty(aura::client::kShowStateKey, state); | 488 if (state != ui::SHOW_STATE_MINIMIZED) |
489 window_->Show(); | 489 window_->Show(); |
oshima
2015/06/06 00:47:35
Thank you joone@ for investigation.
It turns out
| |
490 | |
490 if (delegate_->CanActivate()) { | 491 if (delegate_->CanActivate()) { |
491 if (state != ui::SHOW_STATE_INACTIVE) | 492 if (state != ui::SHOW_STATE_INACTIVE && state != ui::SHOW_STATE_MINIMIZED) |
492 Activate(); | 493 Activate(); |
493 // SetInitialFocus() should be always be called, even for | 494 // SetInitialFocus() should be always be called, even for |
494 // SHOW_STATE_INACTIVE. If the window has to stay inactive, the method will | 495 // SHOW_STATE_INACTIVE. If the window has to stay inactive, the method will |
495 // do the right thing. | 496 // do the right thing. |
496 SetInitialFocus(state); | 497 SetInitialFocus(state); |
497 } | 498 } |
498 } | 499 } |
499 | 500 |
500 bool NativeWidgetAura::IsVisible() const { | 501 bool NativeWidgetAura::IsVisible() const { |
501 return window_ && window_->IsVisible(); | 502 return window_ && window_->IsVisible(); |
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1205 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); | 1206 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); |
1206 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); | 1207 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); |
1207 return gfx::FontList(gfx::Font(caption_font)); | 1208 return gfx::FontList(gfx::Font(caption_font)); |
1208 #else | 1209 #else |
1209 return gfx::FontList(); | 1210 return gfx::FontList(); |
1210 #endif | 1211 #endif |
1211 } | 1212 } |
1212 | 1213 |
1213 } // namespace internal | 1214 } // namespace internal |
1214 } // namespace views | 1215 } // namespace views |
OLD | NEW |