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

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

Issue 2664113004: Reland: mash: Fix MusPropertyMirrorAsh for owned properties; add test. (Closed)
Patch Set: Sync and rebase. Created 3 years, 11 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
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('k') | components/exo/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 60717d783fd0fad580e5be16c6e8b22a5e7cbda9..3e73cc28ab9ded8e92d73525c359ed775bf3b9c1 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -36,8 +36,8 @@
#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/public/cpp/window_properties.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 "ui/aura/client/aura_constants.h"
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('k') | components/exo/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698