Remove WindowState::IsNormalShowState()

ash/wm/default_state.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/default_state.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 132 matching lines @@
 bool DefaultState::ProcessCompoundEvents(WindowState* window_state,
                                          WMEvent event) {
   aura::Window* window = window_state->window();
 
   switch (event) {
     case TOGGLE_MAXIMIZE_CAPTION:
       if (window_state->IsFullscreen()) {
         window_state->ToggleFullscreen();
       } else if (window_state->IsMaximized()) {
         window_state->Restore();
-      } else if (window_state->IsNormalShowType() ||
-                 window_state->IsSnapped()) {
+      } else if (window_state->IsNormalOrSnapped()) {
         if (window_state->CanMaximize())
           window_state->Maximize();
       }
       return true;
     case TOGGLE_MAXIMIZE:
       if (window_state->IsFullscreen())
         window_state->ToggleFullscreen();
       else if (window_state->IsMaximized())
         window_state->Restore();
       else if (window_state->CanMaximize())
@@ skipping 24 matching lines @@
                                     work_area.height()));
       }
       return true;
     }
     case TOGGLE_HORIZONTAL_MAXIMIZE: {
       // Maximize horizontally if:
       // - The window does not have a max width defined.
       // - The window is snapped or has the normal show type.
       if (window->delegate()->GetMaximumSize().width() != 0)
         return true;
-      if (!window_state->IsNormalShowType() && !window_state->IsSnapped())
+      if (!window_state->IsNormalOrSnapped())
         return true;
       gfx::Rect work_area =
           ScreenUtil::GetDisplayWorkAreaBoundsInParent(window);
       if (window_state->IsNormalShowType() &&
           window_state->HasRestoreBounds() &&
           (window->bounds().width() == work_area.width() &&
            window->bounds().x() == work_area.x())) {
         window_state->SetAndClearRestoreBounds();
       } else {
         gfx::Rect new_bounds(work_area.x(),
@@ skipping 149 matching lines @@
       !IsMaximizedOrFullscreenWindowShowType(old_show_type)) {
     window_state->SaveCurrentBoundsForRestore();
   }
 
   // When restoring from a minimized state, we want to restore to the previous
   // bounds. However, we want to maintain the restore bounds. (The restore
   // bounds are set if a user maximized the window in one axis by double
   // clicking the window border for example).
   gfx::Rect restore;
   if (old_show_type == SHOW_TYPE_MINIMIZED &&
-      window_state->IsNormalShowState() &&
+      window_state->IsNormalOrSnapped() &&
       window_state->HasRestoreBounds() &&
       !window_state->unminimize_to_restore_bounds()) {
     restore = window_state->GetRestoreBoundsInScreen();
     window_state->SaveCurrentBoundsForRestore();
   }
 
   if (window_state->IsMaximizedOrFullscreen())
     MoveToDisplayForRestore(window_state);
 
   WindowShowType show_type = window_state->window_show_type();
@@ skipping 65 matching lines @@
              !window_state->window()->layer()->visible()) {
     // The layer may be hidden if the window was previously minimized. Make
     // sure it's visible.
     window_state->window()->Show();
     if (old_show_type == SHOW_TYPE_MINIMIZED &&
         !window_state->IsMaximizedOrFullscreen()) {
       window_state->set_unminimize_to_restore_bounds(false);
     }
   }
 
-  if (window_state->IsNormalShowState())
+  if (window_state->IsNormalOrSnapped())
     window_state->ClearRestoreBounds();
 
   // Set the restore rectangle to the previously set restore rectangle.
   if (!restore.IsEmpty())
     window_state->SetRestoreBoundsInScreen(restore);
 }
 
 bool DefaultState::SetMaximizedOrFullscreenBounds(WindowState* window_state) {
   DCHECK(!window_state->is_dragged());
   if (window_state->IsMaximized()) {
     window_state->SetBoundsDirect(
         ScreenUtil::GetMaximizedWindowBoundsInParent(window_state->window()));
     return true;
   }
   if (window_state->IsFullscreen()) {
     window_state->SetBoundsDirect(
         ScreenUtil::GetDisplayBoundsInParent(window_state->window()));
     return true;
   }
   return false;
 }
 
 }  // namespace wm
 }  // namespace ash