Fix shelf alignment and auto-hide initialization.

ash/mus/window_manager.h

Index: ash/mus/window_manager.h
diff --git a/ash/mus/window_manager.h b/ash/mus/window_manager.h
index 27dae0ee4f4e494351031d48d9c6c3d6320ad1a0..fd134c1f21b733952941fdbf763f3b9781956208 100644
--- a/ash/mus/window_manager.h
+++ b/ash/mus/window_manager.h
@@ -43,7 +43,7 @@ namespace ash {
 
 class RootWindowController;
 class ScreenMus;
-class SystemTrayDelegate;
+class ShellDelegate;
 
 namespace mus {
 
@@ -194,12 +194,8 @@ class WindowManager : public aura::WindowManagerDelegate,
 
   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);
 };