Use Ash's ShelfWindowWatcher for app panel windows.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
index b9b0a4f2716fc3650fea762db835c48e4bfba401..44c677510d006fd28ef6247e2f04acd1a982dcfc 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
@@ -167,8 +167,6 @@ class ChromeLauncherControllerImpl
       const ash::launcher::AppLauncherId& app_launcher_id,
       int index);
 
-  const std::string& GetAppIdFromShelfIdForTest(ash::ShelfID id);
-
  private:
   friend class ChromeLauncherControllerImplTest;
   friend class ShelfAppBrowserTest;
@@ -238,7 +236,7 @@ class ChromeLauncherControllerImpl
       LauncherItemController* controller);
 
   // Create ShelfItem for Browser Shortcut.
-  ash::ShelfID CreateBrowserShortcutLauncherItem();
+  void CreateBrowserShortcutLauncherItem();
 
   // Check if the given |web_contents| is in incognito mode.
   bool IsIncognito(const content::WebContents* web_contents) const;