Remove docked windows entirely in M59.

ash/public/cpp/shell_window_ids.h

Index: ash/public/cpp/shell_window_ids.h
diff --git a/ash/public/cpp/shell_window_ids.h b/ash/public/cpp/shell_window_ids.h
index 9b6a765a03b149b351213fb5b35818fc1b9a13fe..cde7753f35817d67adfba4e8d7d0a66ef74b4013 100644
--- a/ash/public/cpp/shell_window_ids.h
+++ b/ash/public/cpp/shell_window_ids.h
@@ -50,63 +50,60 @@ const int32_t kShellWindowId_DefaultContainer = 6;
 // The container for top-level windows with the 'always-on-top' flag set.
 const int32_t kShellWindowId_AlwaysOnTopContainer = 7;
 
-// The container for windows docked to either side of the desktop.
-const int32_t kShellWindowId_DockedContainer = 8;
-
 // The container for the shelf.
-const int32_t kShellWindowId_ShelfContainer = 9;
+const int32_t kShellWindowId_ShelfContainer = 8;
 
 // The container for bubbles which float over the shelf.
-const int32_t kShellWindowId_ShelfBubbleContainer = 10;
+const int32_t kShellWindowId_ShelfBubbleContainer = 9;
 
 // The container for panel windows.
-const int32_t kShellWindowId_PanelContainer = 11;
+const int32_t kShellWindowId_PanelContainer = 10;
 
 // The container for the app list.
-const int32_t kShellWindowId_AppListContainer = 12;
+const int32_t kShellWindowId_AppListContainer = 11;
 
 // The container for user-specific modal windows.
-const int32_t kShellWindowId_SystemModalContainer = 13;
+const int32_t kShellWindowId_SystemModalContainer = 12;
 
 // The container for the lock screen wallpaper (lock screen background).
-const int32_t kShellWindowId_LockScreenWallpaperContainer = 14;
+const int32_t kShellWindowId_LockScreenWallpaperContainer = 13;
 
 // The container for the lock screen.
-const int32_t kShellWindowId_LockScreenContainer = 15;
+const int32_t kShellWindowId_LockScreenContainer = 14;
 
 // The container for the lock screen modal windows.
-const int32_t kShellWindowId_LockSystemModalContainer = 16;
+const int32_t kShellWindowId_LockSystemModalContainer = 15;
 
 // The container for the status area.
-const int32_t kShellWindowId_StatusContainer = 17;
+const int32_t kShellWindowId_StatusContainer = 16;
 
 // A parent container that holds the virtual keyboard container and ime windows
 // if any. This is to ensure that the virtual keyboard or ime window is stacked
 // above most containers but below the mouse cursor and the power off animation.
-const int32_t kShellWindowId_ImeWindowParentContainer = 18;
+const int32_t kShellWindowId_ImeWindowParentContainer = 17;
 
 // The container for menus.
-const int32_t kShellWindowId_MenuContainer = 19;
+const int32_t kShellWindowId_MenuContainer = 18;
 
 // The container for drag/drop images and tooltips.
-const int32_t kShellWindowId_DragImageAndTooltipContainer = 20;
+const int32_t kShellWindowId_DragImageAndTooltipContainer = 10;

[mfomitchev, 2017/02/25 03:35:46]

This should be 19, not 10. 

Maybe we should be using 
kShellWindowId_DragImageAndTooltipContainer = kShellWindowId_MenuContainer + 1
type of format here instead of assigning values directly to protect against this
type of mistake. Or perhaps even better - use "enum class"? If we didn't have
mash_unittests (where panels are likely half broken), we wouldn't even catch
this with tests.

Also another thing: Can you please remove DOCKED from the ShowState in
window_manager_constants_mojom?

[oshima, 2017/02/27 15:10:08]

I have slight preference to enum, although I think we should have had a test
that can catch it.

Can you update ExpectAllContainers in shell_unittest.cc to ensure that all
containers are different?

[afakhry, 2017/02/27 17:43:50]

Ouch!! Thanks for catching that!!
I'm glad too that we have a test to catch that.
Certainly an enum class would be better, but this CL is already too big, I don't
want to make it even bigger.
Done.

[afakhry, 2017/02/27 17:43:50]

I'd like to convert them to an enum too, but I think I should do this in a
different CL.
Done.

[varkha, 2017/02/28 17:20:32]

I would also prefer to make it enum and have a compiler enforce the ordering 
and uniqueness instead of (or in addition to) relying on a test.

[afakhry, 2017/03/09 22:28:26]

That's also my preference, but let me know If I should do this as part of this
CL?

 
 // The container for bubbles briefly overlaid onscreen to show settings changes
 // (volume, brightness, input method bubbles, etc.).
-const int32_t kShellWindowId_SettingBubbleContainer = 21;
+const int32_t kShellWindowId_SettingBubbleContainer = 20;
 
 // The container for special components overlaid onscreen, such as the
 // region selector for partial screenshots.
-const int32_t kShellWindowId_OverlayContainer = 22;
+const int32_t kShellWindowId_OverlayContainer = 21;
 
 // ID of the window created by PhantomWindowController or DragWindowController.
-const int32_t kShellWindowId_PhantomWindow = 23;
+const int32_t kShellWindowId_PhantomWindow = 22;
 
 // The container for mouse cursor.
-const int32_t kShellWindowId_MouseCursorContainer = 24;
+const int32_t kShellWindowId_MouseCursorContainer = 23;
 
 // The topmost container, used for power off animation.
-const int32_t kShellWindowId_PowerButtonAnimationContainer = 25;
+const int32_t kShellWindowId_PowerButtonAnimationContainer = 24;
 
 const int32_t kShellWindowId_Min = 0;
 const int32_t kShellWindowId_Max = kShellWindowId_PowerButtonAnimationContainer;