Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(619)

Unified Diff: ui/views/widget/native_widget_aura.cc

Issue 1130033003: Make the minimize state work when creating a chrome window in CrOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: a patch for testing the launcher bug Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_aura.cc
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index bf113e6e119de7bcb3ab99b2f21a1d185eba9ef7..51e16b00fd811c9179b0015447eaeb51e10479c8 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -484,11 +484,12 @@ void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
if (!window_)
return;
- if (state == ui::SHOW_STATE_MAXIMIZED || state == ui::SHOW_STATE_FULLSCREEN)
- window_->SetProperty(aura::client::kShowStateKey, state);
- window_->Show();
+ window_->SetProperty(aura::client::kShowStateKey, state);
+ if (state != ui::SHOW_STATE_MINIMIZED)
+ window_->Show();
oshima 2015/06/06 00:47:35 Thank you joone@ for investigation. It turns out
+
if (delegate_->CanActivate()) {
- if (state != ui::SHOW_STATE_INACTIVE)
+ if (state != ui::SHOW_STATE_INACTIVE && state != ui::SHOW_STATE_MINIMIZED)
Activate();
// SetInitialFocus() should be always be called, even for
// SHOW_STATE_INACTIVE. If the window has to stay inactive, the method will
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698