Remove docked windows entirely in M59.

components/sessions/core/session_service_commands.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 "components/sessions/core/session_service_commands.h"
 
 #include <stdint.h>
 #include <string.h>
 
 #include <utility>
@@ skipping 95 matching lines @@
 // Persisted versions of ui::WindowShowState that are written to disk and can
 // never change.
 enum PersistedWindowShowState {
   // SHOW_STATE_DEFAULT (0) never persisted.
   PERSISTED_SHOW_STATE_NORMAL = 1,
   PERSISTED_SHOW_STATE_MINIMIZED = 2,
   PERSISTED_SHOW_STATE_MAXIMIZED = 3,
   // 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 =
     std::map<SessionID::id_type, std::unique_ptr<SessionTab>>;
 using IdToSessionWindow =
     std::map<SessionID::id_type, std::unique_ptr<SessionWindow>>;
 
 // Assert to ensure PersistedWindowShowState is updated if ui::WindowShowState
 // is changed.
 static_assert(ui::SHOW_STATE_END ==
                   static_cast<ui::WindowShowState>(PERSISTED_SHOW_STATE_END),
               "SHOW_STATE_END must equal PERSISTED_SHOW_STATE_END");
 
 // Returns the show state to store to disk based |state|.
 PersistedWindowShowState ShowStateToPersistedShowState(
     ui::WindowShowState state) {
   switch (state) {
     case ui::SHOW_STATE_NORMAL:
       return PERSISTED_SHOW_STATE_NORMAL;
     case ui::SHOW_STATE_MINIMIZED:
       return PERSISTED_SHOW_STATE_MINIMIZED;
     case ui::SHOW_STATE_MAXIMIZED:
       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;
 
     case ui::SHOW_STATE_END:
       break;
   }
   NOTREACHED();
   return PERSISTED_SHOW_STATE_NORMAL;
 }
 
 // Lints show state values when read back from persited disk.
 ui::WindowShowState PersistedShowStateToShowState(int state) {
   switch (state) {
     case PERSISTED_SHOW_STATE_NORMAL:
       return ui::SHOW_STATE_NORMAL;
     case PERSISTED_SHOW_STATE_MINIMIZED:
       return ui::SHOW_STATE_MINIMIZED;
     case PERSISTED_SHOW_STATE_MAXIMIZED:
       return ui::SHOW_STATE_MAXIMIZED;
     case PERSISTED_SHOW_STATE_FULLSCREEN:
       return ui::SHOW_STATE_FULLSCREEN;
+    case PERSISTED_SHOW_STATE_DETACHED_DEPRECATED:
     case PERSISTED_SHOW_STATE_DOCKED_DEPRECATED:
-      return ui::SHOW_STATE_DOCKED;
-    case PERSISTED_SHOW_STATE_DETACHED_DEPRECATED:
       return ui::SHOW_STATE_NORMAL;
   }
   NOTREACHED();
   return ui::SHOW_STATE_NORMAL;
 }
 
 // Iterates through the vector updating the selected_tab_index of each
 // SessionWindow based on the actual tabs that were restored.
 void UpdateSelectedTabIndex(
     std::vector<std::unique_ptr<SessionWindow>>* windows) {
@@ skipping 712 matching lines @@
     SortTabsBasedOnVisualOrderAndClear(&windows, valid_windows);
     UpdateSelectedTabIndex(valid_windows);
   }
   // AddTabsToWindows should have processed all the tabs.
   DCHECK_EQ(0u, tabs.size());
   // SortTabsBasedOnVisualOrderAndClear should have processed all the windows.
   DCHECK_EQ(0u, windows.size());
 }
 
 }  // namespace sessions