| Index: chrome/browser/ui/views/task_manager_view.cc
|
| diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
|
| index f1ab1fb939c521da90cce64c4fa08ac6750e6794..8c7f9a03fc32d58db9d70c2a345b7d882243a8cb 100644
|
| --- a/chrome/browser/ui/views/task_manager_view.cc
|
| +++ b/chrome/browser/ui/views/task_manager_view.cc
|
| @@ -39,6 +39,7 @@
|
| #include "ash/resources/grit/ash_resources.h" // nogncheck
|
| #include "ash/wm/window_properties.h" // nogncheck
|
| #include "ash/wm/window_util.h" // nogncheck
|
| +#include "chrome/browser/ui/ash/ash_util.h" // nogncheck
|
| #include "chrome/browser/ui/ash/property_util.h" // nogncheck
|
| #endif // defined(USE_ASH)
|
|
|
| @@ -75,7 +76,7 @@ task_manager::TaskManagerTableModel* TaskManagerView::Show(Browser* browser) {
|
| gfx::NativeWindow window =
|
| browser ? browser->window()->GetNativeWindow() : nullptr;
|
| #if defined(USE_ASH)
|
| - if (!window)
|
| + if (!chrome::IsRunningInMash() && !window)
|
| window = ash::wm::GetActiveWindow();
|
| #endif
|
|
|
|
|