mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient.

chrome/browser/ui/views/task_manager_view.cc

 // Copyright 2015 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/ui/views/task_manager_view.h"
 
 #include <stddef.h>
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 21 matching lines @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 #if defined(USE_ASH)
 // Note: gn check complains here, despite the correct conditional //ash dep.
 #include "ash/common/shelf/shelf_item_types.h"    // nogncheck
 #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)
 
 #if defined(OS_WIN)
 #include "chrome/browser/shell_integration_win.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
 #endif  // defined(OS_WIN)
 
 namespace task_manager {
@@ skipping 16 matching lines @@
     g_task_manager_view->SelectTaskOfActiveTab(browser);
     g_task_manager_view->GetWidget()->Activate();
     return g_task_manager_view->table_model_.get();
   }
 
   g_task_manager_view = new TaskManagerView();
 
   gfx::NativeWindow window =
       browser ? browser->window()->GetNativeWindow() : nullptr;
 #if defined(USE_ASH)
-  if (!window)
+  if (!chrome::IsRunningInMash() && !window)
     window = ash::wm::GetActiveWindow();
 #endif
 
   DialogDelegate::CreateDialogWidget(g_task_manager_view, window, nullptr);
   g_task_manager_view->InitAlwaysOnTopState();
 
 #if defined(OS_WIN)
   // Set the app id for the task manager to the app id of its parent browser. If
   // no parent is specified, the app id will default to that of the initial
   // process.
@@ skipping 273 matching lines @@
   if (!g_browser_process->local_state())
     return;
 
   const base::DictionaryValue* dictionary =
       g_browser_process->local_state()->GetDictionary(GetWindowName());
   if (dictionary)
     dictionary->GetBoolean("always_on_top", &is_always_on_top_);
 }
 
 }  // namespace task_manager