ash/system/palette/palette_tray.cc - Issue 2907853002: [mus+ash] Removes WmWindow from ash/shelf and ash/shell

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: ash/system/palette/palette_tray.cc

Issue 2907853002: [mus+ash] Removes WmWindow from ash/shelf and ash/shell (Closed)

Patch Set: [mus+ash] Removes WmWindow from ash/shelf and ash/shell (removed some more wm_window.h) Created 3 years, 7 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: ash/system/palette/palette_tray.cc

diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc

index 02ca2cf8eca56b67c13acc0078fb9e6e0b9dd25c..fa1790d88c5e996823ac7dd1dce0cb29511df9fa 100644

--- a/ash/system/palette/palette_tray.cc

+++ b/ash/system/palette/palette_tray.cc

@@ -22,7 +22,6 @@

#include "ash/system/tray/tray_container.h"

#include "ash/system/tray/tray_popup_header_button.h"

#include "ash/system/tray/tray_popup_item_style.h"

-#include "ash/wm_window.h"

#include "base/metrics/histogram_macros.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

@@ -359,7 +358,7 @@ void PaletteTray::OnActiveToolChanged() {

}

aura::Window* PaletteTray::GetWindow() {

- return shelf()->GetWindow()->aura_window();

+ return shelf()->GetWindow();

}

void PaletteTray::AnchorUpdated() {

« no previous file with comments | « ash/shell_observer.h ('k') | ash/system/toast/toast_manager_unittest.cc » ('j') | no next file with comments »