mash: remove the LockStateControllerDelegate.

ash/shell.cc

 // Copyright (c) 2012 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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 706 matching lines @@
 
   system_gesture_filter_.reset(new SystemGestureEventFilter);
   AddPreTargetHandler(system_gesture_filter_.get());
 
 #if defined(OS_CHROMEOS)
   sticky_keys_controller_.reset(new StickyKeysController);
 #endif
   screen_pinning_controller_.reset(
       new ScreenPinningController(window_tree_host_manager_.get()));
 
-  lock_state_controller_.reset(new LockStateController);
+  lock_state_controller_ = base::MakeUnique<LockStateController>(
+      wm_shell_->delegate()->GetShellConnector());

[Elliot Glaysher, 2016/11/02 19:13:29]

Q: LockStateController can't trivially be moved to WmShell because it requires
the root window to have been created during initialization. However, this
appears to be the first use of mojo in this file. Is this ok, or do I have to
add a post-window init phase to WmShell?

[James Cook, 2016/11/02 20:20:03]

I think this is OK. WmShell's constructor touches the shell connector and is
created before this. Also, it looks like you're just creating a couple objects
and caching the connector pointer, which should be fine.

[Elliot Glaysher, 2016/11/02 21:45:16]

Acknowledged.

   power_button_controller_.reset(
       new PowerButtonController(lock_state_controller_.get()));
 #if defined(OS_CHROMEOS)
   // Pass the initial display state to PowerButtonController.
   power_button_controller_->OnDisplayModeChanged(
       display_configurator_->cached_displays());
 #endif
   wm_shell_->AddShellObserver(lock_state_controller_.get());
 
   drag_drop_controller_.reset(new DragDropController);
@@ skipping 159 matching lines @@
 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
   return std::unique_ptr<ui::EventTargetIterator>();
 }
 
 ui::EventTargeter* Shell::GetEventTargeter() {
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace ash