ash/system/palette/mock_palette_tool_delegate.h - Issue 2895843002: chromeos: Eliminate WmWindow from //ash/system

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/mock_palette_tool_delegate.h

Issue 2895843002: chromeos: Eliminate WmWindow from //ash/system (Closed)

Patch Set: comments 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/mock_palette_tool_delegate.h

diff --git a/ash/system/palette/mock_palette_tool_delegate.h b/ash/system/palette/mock_palette_tool_delegate.h

index 8e8bc64819d3045db21d0827fa5b96a3a4136b40..b9626cb391ad6456df973dd8d1d33b90c047cbad 100644

--- a/ash/system/palette/mock_palette_tool_delegate.h

+++ b/ash/system/palette/mock_palette_tool_delegate.h

@@ -20,7 +20,7 @@ class MockPaletteToolDelegate : public PaletteTool::Delegate {

MOCK_METHOD1(DisableTool, void(PaletteToolId tool_id));

MOCK_METHOD0(HidePalette, void());

MOCK_METHOD0(HidePaletteImmediately, void());

- MOCK_METHOD0(GetWindow, WmWindow*());

+ MOCK_METHOD0(GetWindow, aura::Window*());

MOCK_METHOD1(RecordPaletteOptionsUsage, void(PaletteTrayOptions option));

MOCK_METHOD1(RecordPaletteModeCancellation, void(PaletteModeCancelType type));

};

« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/system/palette/palette_tool.h » ('j') | no next file with comments »