Remove WindowState::IsNormalShowState()

ash/wm/window_state.cc

Index: ash/wm/window_state.cc
diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc
index 4f5c1569092bd13dd351eb680283e2e9d75b5a32..a9116b1db19eb78474a33114471db8e3e6ceeef7 100644
--- a/ash/wm/window_state.cc
+++ b/ash/wm/window_state.cc
@@ -140,9 +140,9 @@ bool WindowState::IsMaximizedOrFullscreen() const {
       show_state == ui::SHOW_STATE_MAXIMIZED;
 }
 
-bool WindowState::IsNormalShowState() const {
-  ui::WindowShowState state = GetShowState();
-  return state == ui::SHOW_STATE_NORMAL || state == ui::SHOW_STATE_DEFAULT;
+bool WindowState::IsSnapped() const {
+  return window_show_type_ == SHOW_TYPE_LEFT_SNAPPED ||
+      window_show_type_ == SHOW_TYPE_RIGHT_SNAPPED;
 }
 
 bool WindowState::IsNormalShowType() const {
@@ -150,6 +150,10 @@ bool WindowState::IsNormalShowType() const {
       window_show_type_ == SHOW_TYPE_DEFAULT;
 }
 
+bool WindowState::IsNormalOrSnapped() const {
+  return IsNormalShowType() || IsSnapped();
+}
+
 bool WindowState::IsActive() const {
   return IsActiveWindow(window_);
 }
@@ -159,11 +163,6 @@ bool WindowState::IsDocked() const {
       window_->parent()->id() == internal::kShellWindowId_DockedContainer;
 }
 
-bool WindowState::IsSnapped() const {
-  return window_show_type_ == SHOW_TYPE_LEFT_SNAPPED ||
-      window_show_type_ == SHOW_TYPE_RIGHT_SNAPPED;
-}
-
 bool WindowState::CanMaximize() const {
   return window_->GetProperty(aura::client::kCanMaximizeKey);
 }