Remove WindowState::IsNormalShowState()

ash/wm/window_state.h

 // Copyright 2013 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.
 
 #ifndef ASH_WM_WINDOW_STATE_H_
 #define ASH_WM_WINDOW_STATE_H_
 
 #include "ash/ash_export.h"
 #include "ash/wm/drag_details.h"
 #include "ash/wm/wm_types.h"
@@ skipping 70 matching lines @@
   // Returns the window's current ash show type.
   // Refer to WindowShowType definition in wm_types.h as for why Ash
   // has its own show type.
   WindowShowType window_show_type() const { return window_show_type_; }
 
   // Predicates to check window state.
   bool IsMinimized() const;
   bool IsMaximized() const;
   bool IsFullscreen() const;
   bool IsMaximizedOrFullscreen() const;
-
-  // DEPRECATED. TODO(pkotwicz): Remove (crbug.com/326392)
-  // True if the window's show state is SHOW_STATE_NORMAL or
-  // SHOW_STATE_DEFAULT.
-  bool IsNormalShowState() const;
+  bool IsSnapped() const;
 
   // True if the window's show type is SHOW_TYPE_NORMAL or SHOW_TYPE_DEFAULT.
-  // Unlike IsNormalShowState(), returns false if the window's show type is
-  // SHOW_TYPE_LEFT_SNAPPED or SHOW_TYPE_RIGHT_SNAPPED.
   bool IsNormalShowType() const;
 
+  bool IsNormalOrSnapped() const;
+
   bool IsActive() const;
   bool IsDocked() const;
-  bool IsSnapped() const;
 
   // Checks if the window can change its state accordingly.
   bool CanMaximize() const;
   bool CanMinimize() const;
   bool CanResize() const;
   bool CanSnap() const;
   bool CanActivate() const;
 
   // Returns true if the window has restore bounds.
   bool HasRestoreBounds() const;
@@ skipping 260 matching lines @@
 ASH_EXPORT WindowState* GetWindowState(aura::Window* window);
 
 // const version of GetWindowState.
 ASH_EXPORT const WindowState*
 GetWindowState(const aura::Window* window);
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_WINDOW_STATE_H_