Make the Remove Extension dialog modal for win app list.

chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc

 // Copyright (c) 2012 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/extensions/extension_uninstall_dialog.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
@@ skipping 12 matching lines @@
 
 class ExtensionUninstallDialogDelegateView;
 
 // TODO(estade): remove this when UseNewStyle() is the default.
 int HorizontalMargin() {
   return views::DialogDelegate::UseNewStyle() ? views::kButtonHEdgeMarginNew :
                                                 views::kPanelHorizMargin;
 }
 
 // Returns parent window for extension uninstall dialog.
-// For ash, use app list window if it is visible.
-// For other platforms or when app list is not visible on ash,
-// use the given browser window.
-// Note this function could return NULL if ash app list is not visible and
+// For platforms with an app list, use the app list window if it is visible.
+// For other platforms or when app list is not visible, use the given browser
+// window.
+// Note this function could return NULL if the app list is not visible and
 // there is no browser window.
 gfx::NativeWindow GetParent(Browser* browser) {
-#if defined(USE_ASH)
-  if (ash::Shell::HasInstance()) {
-    gfx::NativeWindow app_list = ash::Shell::GetInstance()->GetAppListWindow();
-    if (app_list)
-      return app_list;
-  }
-#endif
+  gfx::NativeWindow window = AppListService::Get()->GetAppListWindow();
+  if (window)
+    return window;
 
   if (browser && browser->window())
     return browser->window()->GetNativeWindow();
 
   return NULL;
 }
 
 // Views implementation of the uninstall dialog.
 class ExtensionUninstallDialogViews : public ExtensionUninstallDialog {
  public:
@@ skipping 183 matching lines @@
 
 }  // namespace
 
 // static
 ExtensionUninstallDialog* ExtensionUninstallDialog::Create(
     Profile* profile,
     Browser* browser,
     Delegate* delegate) {
   return new ExtensionUninstallDialogViews(profile, browser, delegate);
 }