CROS: Handle Shelf GetAppInfo when there are no active Browser and WebContents.

Bug: 1000169
Change-Id: Id3e32e8587a1449f08c7de73c394eb4cf7c2d1be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1783801
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696892}

chrome/browser/ui/apps/app_info_dialog.h

@@ -48,6 +48,12 @@ void ShowAppInfoInAppList(gfx::NativeWindow parent,
                           const extensions::Extension* app);
 #endif
 
+// Shows the chrome app information in an independent dialog box and runs
+// close_callback when the app info window is closed.
+void ShowAppInfo(Profile* profile,
+                 const extensions::Extension* app,
+                 const base::Closure& close_callback);
+
 // Shows the chrome app information in a native dialog box.
 void ShowAppInfoInNativeDialog(content::WebContents* web_contents,
                                Profile* profile,

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

@@ -866,11 +866,7 @@ void ChromeLauncherController::DoShowAppInfoFlow(
                             AppInfoLaunchSource::FROM_SHELF,
                             AppInfoLaunchSource::NUM_LAUNCH_SOURCES);
 
-  ShowAppInfoInNativeDialog(BrowserList::GetInstance()
-                                ->GetLastActive()
-                                ->tab_strip_model()
-                                ->GetActiveWebContents(),
-                            profile, extension, base::Closure());
+  ShowAppInfo(profile, extension, base::Closure());
 }
 
 ///////////////////////////////////////////////////////////////////////////////

chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc

@@ -14,6 +14,8 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/apps/app_info_dialog.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h"
 #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h"
 #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.h"
@@ -50,6 +52,7 @@ namespace {
 // The color of the separator used inside the dialog - should match the app
 // list's app_list::kDialogSeparatorColor
 constexpr SkColor kDialogSeparatorColor = SkColorSetRGB(0xD1, 0xD1, 0xD1);
+constexpr gfx::Size kDialogSize = gfx::Size(380, 490);
 
 }  // namespace
 
@@ -76,11 +79,21 @@ void ShowAppInfoInAppList(gfx::NativeWindow parent,
 }
 #endif
 
+void ShowAppInfo(Profile* profile,
+                 const extensions::Extension* app,
+                 const base::Closure& close_callback) {
+  views::DialogDelegate* dialog = CreateDialogContainerForView(
+      std::make_unique<AppInfoDialog>(profile, app), kDialogSize,
+      close_callback);
+  views::Widget* dialog_widget =
+      views::DialogDelegate::CreateDialogWidget(dialog, nullptr, nullptr);
+  dialog_widget->Show();
+}
+
 void ShowAppInfoInNativeDialog(content::WebContents* web_contents,
                                Profile* profile,
                                const extensions::Extension* app,
                                const base::Closure& close_callback) {
-  constexpr gfx::Size kDialogSize = gfx::Size(380, 490);
   views::DialogDelegate* dialog = CreateDialogContainerForView(
       std::make_unique<AppInfoDialog>(profile, app), kDialogSize,
       close_callback);