Enhance chrome.app.window API for shelf integration with restore support

chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

 // Copyright 2014 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 "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
 
 #include <algorithm>
 
 #include "ash/wm/window_util.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
@@ skipping 65 matching lines @@
   // Return true if any windows are visible.
   for (const auto* window : windows_) {
     if (window->GetNativeWindow()->IsVisible())
       return true;
   }
   return false;
 }
 
 void AppWindowLauncherItemController::Launch(ash::LaunchSource source,
                                              int event_flags) {
-  launcher_controller()->LaunchApp(app_id(), source, ui::EF_NONE);
+  launcher_controller()->LaunchApp(app_id(), launch_id(), source, ui::EF_NONE);
 }
 
 ash::ShelfItemDelegate::PerformedAction
 AppWindowLauncherItemController::Activate(ash::LaunchSource source) {
   DCHECK(!windows_.empty());
   ui::BaseWindow* window_to_activate =
       last_active_window_ ? last_active_window_ : windows_.back();
   window_to_activate->Activate();
   return kExistingWindowActivated;
 }
@@ skipping 97 matching lines @@
   if (window_to_show->IsActive()) {
     // Coming here, only a single window is active. For keyboard activations
     // the window gets animated.
     AnimateWindow(window_to_show->GetNativeWindow(),
                   wm::WINDOW_ANIMATION_TYPE_BOUNCE);
   } else {
     return ShowAndActivateOrMinimize(window_to_show);
   }
   return kNoAction;
 }