mash: Implement restore on item click.

BUG=none

Review-Url: https://codereview.chromium.org/2138483002
Cr-Commit-Position: refs/heads/master@{#404574}

ash/mus/user_window_controller_impl.cc

@@ -197,10 +197,12 @@ void UserWindowControllerImpl::AddUserWindowObserver(
   user_window_observer_->OnUserWindowObserverAdded(std::move(user_windows));
 }
 
-void UserWindowControllerImpl::FocusUserWindow(uint32_t window_id) {
+void UserWindowControllerImpl::ActivateUserWindow(uint32_t window_id) {
   ::ui::Window* window = GetUserWindowById(window_id);
-  if (window)
+  if (window) {
+    window->SetVisible(true);
     window->SetFocus();
+  }
 }
 
 }  // namespace mus

ash/mus/user_window_controller_impl.h

@@ -56,7 +56,7 @@ class UserWindowControllerImpl : public mojom::UserWindowController,
 
   // mojom::UserWindowController:
   void AddUserWindowObserver(mojom::UserWindowObserverPtr observer) override;
-  void FocusUserWindow(uint32_t window_id) override;
+  void ActivateUserWindow(uint32_t window_id) override;
 
   RootWindowController* root_controller_;
   mojom::UserWindowObserverPtr user_window_observer_;

ash/public/interfaces/user_window_controller.mojom

@@ -34,5 +34,5 @@ interface UserWindowObserver {
 // TODO(msw): Add minimization, restoration, opening a chooser view, etc.
 interface UserWindowController {
   AddUserWindowObserver(UserWindowObserver observer);
-  FocusUserWindow(uint32 window_id);
+  ActivateUserWindow(uint32 window_id);
 };

ash/sysui/shelf_delegate_mus.cc

@@ -94,7 +94,7 @@ class ShelfItemDelegateMus : public ShelfItemDelegate {
       return false;
     }
     void ExecuteCommand(int command_id, int event_flags) override {
-      item_delegate_->user_window_controller_->FocusUserWindow(command_id);
+      item_delegate_->user_window_controller_->ActivateUserWindow(command_id);
     }
 
    private:
@@ -111,7 +111,7 @@ class ShelfItemDelegateMus : public ShelfItemDelegate {
       return kNewWindowCreated;
     }
     if (window_id_to_title_.size() == 1) {
-      user_window_controller_->FocusUserWindow(
+      user_window_controller_->ActivateUserWindow(
           window_id_to_title_.begin()->first);
       return kExistingWindowActivated;
     }