Remove docked windows entirely in M59.

components/sessions/core/session_service_commands.cc

Index: components/sessions/core/session_service_commands.cc
diff --git a/components/sessions/core/session_service_commands.cc b/components/sessions/core/session_service_commands.cc
index d066372deaa837d96429fe52a5c52c4d523599aa..b7032aa36715140131d81f034aefea839b2d4508 100644
--- a/components/sessions/core/session_service_commands.cc
+++ b/components/sessions/core/session_service_commands.cc
@@ -113,8 +113,11 @@ enum PersistedWindowShowState {
   // SHOW_STATE_INACTIVE (4) never persisted.
   PERSISTED_SHOW_STATE_FULLSCREEN = 5,
   PERSISTED_SHOW_STATE_DETACHED_DEPRECATED = 6,
+  PERSISTED_SHOW_STATE_END = 6,

[sky, 2017/03/16 04:24:23]

I think you should keep END at 7, and after dock, but change the assert to -1
with a description. My rationale is if you keep end here it's all to easy to
miss it and then make the next value 7, which we wouldn't want to do.

[varkha, 2017/03/16 14:13:54]

Or maybe set it to 8 to make detached and docked deprecated states handling
similar and shift assert by -2 with a comment that deprecated states at the end
of enum are not represented in ui::WindowShowState.

[afakhry, 2017/03/16 17:50:23]

Done.

[afakhry, 2017/03/16 17:50:23]

Done, but also followed varkha's comments below.

+
+  // This doesn't have a corresponding ui::WindowShowState anymore, hence we
+  // list it here below PERSISTED_SHOW_STATE_END.
   PERSISTED_SHOW_STATE_DOCKED_DEPRECATED = 7,
-  PERSISTED_SHOW_STATE_END = 7
 };
 
 using IdToSessionTab =
@@ -140,11 +143,6 @@ PersistedWindowShowState ShowStateToPersistedShowState(
       return PERSISTED_SHOW_STATE_MAXIMIZED;
     case ui::SHOW_STATE_FULLSCREEN:
       return PERSISTED_SHOW_STATE_FULLSCREEN;
-
-    // TODO(afakhry): Remove Docked Windows in M58.
-    case ui::SHOW_STATE_DOCKED:
-      return PERSISTED_SHOW_STATE_DOCKED_DEPRECATED;
-
     case ui::SHOW_STATE_DEFAULT:
     case ui::SHOW_STATE_INACTIVE:
       return PERSISTED_SHOW_STATE_NORMAL;
@@ -167,9 +165,8 @@ ui::WindowShowState PersistedShowStateToShowState(int state) {
       return ui::SHOW_STATE_MAXIMIZED;
     case PERSISTED_SHOW_STATE_FULLSCREEN:
       return ui::SHOW_STATE_FULLSCREEN;
-    case PERSISTED_SHOW_STATE_DOCKED_DEPRECATED:
-      return ui::SHOW_STATE_DOCKED;
     case PERSISTED_SHOW_STATE_DETACHED_DEPRECATED:
+    case PERSISTED_SHOW_STATE_DOCKED_DEPRECATED:
       return ui::SHOW_STATE_NORMAL;
   }
   NOTREACHED();