chrome/browser/ui/ash/launcher/settings_window_observer.cc - Issue 2663383003: Revert of mash: Fix MusPropertyMirrorAsh for owned properties; add test.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/settings_window_observer.cc

Issue 2663383003: Revert of mash: Fix MusPropertyMirrorAsh for owned properties; add test. (Closed)

Patch Set: 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:

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 652002abf83e48704d6add468294643b223f43b5..69ea9d9c31a962e2ebc216ef9282931cb5691e28 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/memory/ptr_util.h"

#include "chrome/browser/ui/ash/ash_util.h"

#include "chrome/browser/ui/browser.h"