Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3699)

Unified Diff: chrome/browser/ui/views/task_manager_view.cc

Issue 2434463004: mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient. (Closed)
Patch Set: Rebase to ToT Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698