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

Side by Side Diff: ash/common/wm/window_state.cc

Issue 2625113004: Unify window fullscreen and minimizing implementation (Closed)
Patch Set: Update Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/common/wm/window_state.h" 5 #include "ash/common/wm/window_state.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/wm/default_state.h" 9 #include "ash/common/wm/default_state.h"
10 #include "ash/common/wm/window_positioning_utils.h" 10 #include "ash/common/wm/window_positioning_utils.h"
(...skipping 17 matching lines...) Expand all
28 case ui::SHOW_STATE_MINIMIZED: 28 case ui::SHOW_STATE_MINIMIZED:
29 return WM_EVENT_MINIMIZE; 29 return WM_EVENT_MINIMIZE;
30 case ui::SHOW_STATE_MAXIMIZED: 30 case ui::SHOW_STATE_MAXIMIZED:
31 return WM_EVENT_MAXIMIZE; 31 return WM_EVENT_MAXIMIZE;
32 case ui::SHOW_STATE_FULLSCREEN: 32 case ui::SHOW_STATE_FULLSCREEN:
33 return WM_EVENT_FULLSCREEN; 33 return WM_EVENT_FULLSCREEN;
34 case ui::SHOW_STATE_INACTIVE: 34 case ui::SHOW_STATE_INACTIVE:
35 return WM_EVENT_SHOW_INACTIVE; 35 return WM_EVENT_SHOW_INACTIVE;
36 case ui::SHOW_STATE_DOCKED: 36 case ui::SHOW_STATE_DOCKED:
37 return WM_EVENT_DOCK; 37 return WM_EVENT_DOCK;
38 case ui::SHOW_STATE_PREVIOUS:
38 case ui::SHOW_STATE_END: 39 case ui::SHOW_STATE_END:
39 NOTREACHED() << "No WMEvent defined for the show state:" 40 NOTREACHED() << "No WMEvent defined for the show state:"
40 << requested_show_state; 41 << requested_show_state;
41 } 42 }
42 return WM_EVENT_NORMAL; 43 return WM_EVENT_NORMAL;
43 } 44 }
44 45
45 } // namespace 46 } // namespace
46 47
47 WindowState::~WindowState() {} 48 WindowState::~WindowState() {}
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 if (!window_->GetTargetVisibility()) { 391 if (!window_->GetTargetVisibility()) {
391 SetBoundsConstrained(new_bounds); 392 SetBoundsConstrained(new_bounds);
392 return; 393 return;
393 } 394 }
394 395
395 window_->SetBoundsDirectCrossFade(new_bounds); 396 window_->SetBoundsDirectCrossFade(new_bounds);
396 } 397 }
397 398
398 } // namespace wm 399 } // namespace wm
399 } // namespace ash 400 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698