app_list: Open app info dialog modally with AppList window as parent.

This fixes the problem of the launcher closing after clicking on the\
app info drop down menu item on ChromeOS.

Note this CL partially reverts the mash changes made in
https://chromium-review.googlesource.com/c/chromium/src/+/897470

TEST=unit test + manually verified
BUG=987304

Change-Id: If92559f5d205d41db94c63aaf01090011552ff2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1726756
Commit-Queue: Tim Song <tengs@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683426}

chrome/browser/ui/app_list/app_list_client_impl_browsertest.cc

@@ -122,6 +122,27 @@ IN_PROC_BROWSER_TEST_F(AppListClientImplBrowserTest, UninstallApp) {
   EXPECT_TRUE(client->GetAppListWindow());
 }
 
+IN_PROC_BROWSER_TEST_F(AppListClientImplBrowserTest, ShowAppInfo) {
+  AppListClientImpl* client = AppListClientImpl::GetInstance();
+  const extensions::Extension* app = InstallPlatformApp("minimal");
+
+  // Bring up the app list.
+  EXPECT_FALSE(client->GetAppListWindow());
+  client->ShowAppList();
+  EXPECT_TRUE(client->GetAppListWindow());
+  EXPECT_TRUE(wm::GetTransientChildren(client->GetAppListWindow()).empty());
+
+  // Open the app info dialog.
+  base::RunLoop run_loop;
+  client->DoShowAppInfoFlow(profile(), app->id());
+  run_loop.RunUntilIdle();
+  EXPECT_FALSE(wm::GetTransientChildren(client->GetAppListWindow()).empty());
+
+  // The app list should not be dismissed when the dialog is shown.
+  EXPECT_TRUE(client->app_list_visible());
+  EXPECT_TRUE(client->GetAppListWindow());
+}
+
 // Test the CreateNewWindow function of the controller delegate.
 IN_PROC_BROWSER_TEST_F(AppListClientImplBrowserTest, CreateNewWindow) {
   AppListClientImpl* client = AppListClientImpl::GetInstance();

chrome/browser/ui/app_list/app_list_controller_delegate.cc

@@ -118,7 +118,8 @@ void AppListControllerDelegate::DoShowAppInfoFlow(
         const extensions::Extension* extension =
             GetExtension(profile, extension_id);
         DCHECK(extension);
-        ShowAppInfoInAppList(bounds, profile, extension);
+        ShowAppInfoInAppList(self->GetAppListWindow(), bounds, profile,
+                             extension);
       },
       weak_ptr_factory_.GetWeakPtr(), profile, extension_id));
 }

chrome/browser/ui/apps/app_info_dialog.h

@@ -8,6 +8,10 @@
 #include "base/callback_forward.h"
 #include "chrome/common/buildflags.h"
 
+#if BUILDFLAG(ENABLE_APP_LIST)
+#include "ui/gfx/native_widget_types.h"
+#endif
+
 class Profile;
 
 namespace content {
@@ -37,7 +41,8 @@ bool CanShowAppInfoDialog();
 #if BUILDFLAG(ENABLE_APP_LIST)
 // Shows the chrome app information as a frameless window for the given |app|
 // and |profile| at the given |app_info_bounds|.
-void ShowAppInfoInAppList(const gfx::Rect& app_info_bounds,
+void ShowAppInfoInAppList(gfx::NativeWindow parent,
+                          const gfx::Rect& app_info_bounds,
                           Profile* profile,
                           const extensions::Extension* app);
 #endif

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

@@ -45,21 +45,12 @@
 #include "chrome/browser/ui/views/apps/app_info_dialog/arc_app_info_links_panel.h"
 #endif
 
-#if BUILDFLAG(ENABLE_APP_LIST)
-#include "ui/aura/window.h"
-#endif
-
 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);
 
-#if BUILDFLAG(ENABLE_APP_LIST)
-// The elevation used for dialog shadow effect.
-constexpr int kDialogShadowElevation = 24;
-#endif
-
 }  // namespace
 
 bool CanShowAppInfoDialog() {
@@ -71,20 +62,16 @@ bool CanShowAppInfoDialog() {
 }
 
 #if BUILDFLAG(ENABLE_APP_LIST)
-void ShowAppInfoInAppList(const gfx::Rect& app_info_bounds,
+void ShowAppInfoInAppList(gfx::NativeWindow parent,
+                          const gfx::Rect& app_info_bounds,
                           Profile* profile,
                           const extensions::Extension* app) {
   views::DialogDelegate* dialog = CreateAppListContainerForView(
       std::make_unique<AppInfoDialog>(profile, app));
-  views::Widget* dialog_widget = new views::Widget();
-  views::Widget::InitParams params =
-      views::DialogDelegate::GetDialogWidgetInitParams(dialog, nullptr, nullptr,
-                                                       app_info_bounds);
-  params.shadow_type = views::Widget::InitParams::SHADOW_TYPE_DEFAULT;
-  params.shadow_elevation = kDialogShadowElevation;
-  dialog_widget->Init(std::move(params));
-  // The title is not shown on the dialog, but it is used for overview mode.
-  dialog_widget->GetNativeWindow()->SetTitle(base::UTF8ToUTF16(app->name()));
+
+  views::Widget* dialog_widget =
+      constrained_window::CreateBrowserModalDialogViews(dialog, parent);
+  dialog_widget->SetBounds(app_info_bounds);
   dialog_widget->Show();
 }
 #endif