Fix shelf alignment and auto-hide initialization.

ash/mus/window_manager.h

 // Copyright 2015 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.
 
 #ifndef ASH_MUS_WINDOW_MANAGER_H_
 #define ASH_MUS_WINDOW_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 25 matching lines @@
 }
 
 namespace wm {
 class WMState;
 }
 
 namespace ash {
 
 class RootWindowController;
 class ScreenMus;
-class SystemTrayDelegate;
+class ShellDelegate;
 
 namespace mus {
 
 class AcceleratorHandler;
 class ShadowController;
 class WmLookupMus;
 class WmTestHelper;
 
 // WindowManager serves as the WindowManagerDelegate and
 // WindowTreeClientDelegate for mash. WindowManager creates (and owns)
@@ skipping 130 matching lines @@
 
   bool created_shell_ = false;
 
   std::unique_ptr<WmLookupMus> lookup_;
 
   std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
   uint16_t next_accelerator_namespace_id_ = 0u;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
-  // If non-null this is used as the return value from
-  // ShellDelegateMus::CreateSystemTrayDelegate(). This is only set in tests.
-  //
-  // TODO(jamescook): Pass a TestShellDelegate into WindowManager and use it to
-  // create the various test delegates rather than a member.
-  std::unique_ptr<SystemTrayDelegate> system_tray_delegate_for_test_;
+  // Only set in tests. If non-null this is used as the shell delegate.
+  std::unique_ptr<ShellDelegate> shell_delegate_for_test_;

[James Cook, 2017/02/14 15:12:07]

Woo hoo, thanks for doing this!

[msw, 2017/02/14 16:26:18]

You're welcome :)

 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_