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

Unified Diff: chrome/browser/ui/ash/launcher/settings_window_observer.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
Index: chrome/browser/ui/ash/launcher/settings_window_observer.cc
diff --git a/chrome/browser/ui/ash/launcher/settings_window_observer.cc b/chrome/browser/ui/ash/launcher/settings_window_observer.cc
index 1912e85cdfc4258e72c04867b471b9359f5a7d15..af2e9eec038d7e274415ae2e03ce35e6b8637b29 100644
--- a/chrome/browser/ui/ash/launcher/settings_window_observer.cc
+++ b/chrome/browser/ui/ash/launcher/settings_window_observer.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/ui/ash/launcher/settings_window_observer.h"
#include "ash/common/shelf/shelf_item_types.h"
+#include "ash/public/cpp/window_properties.h"
#include "ash/resources/grit/ash_resources.h"
-#include "ash/wm/window_properties.h"
#include "base/feature_list.h"
#include "base/memory/ptr_util.h"
#include "chrome/browser/ui/ash/ash_util.h"

Powered by Google App Engine
This is Rietveld 408576698