Remove WindowState::IsNormalShowState()

ash/wm/window_state.h

Index: ash/wm/window_state.h
diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h
index 64075dfde2df98abaea29c3cd8f6a87af24d0e6c..21be06644efc53fa6fb26d9b505ecbe6b5d79fd3 100644
--- a/ash/wm/window_state.h
+++ b/ash/wm/window_state.h
@@ -88,20 +88,15 @@ class ASH_EXPORT WindowState : public aura::WindowObserver {
   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;