ash/test/test_shell_delegate.h - Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell.

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/test/test_shell_delegate.h

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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: ash/test/test_shell_delegate.h

diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h

index 704d83d2b23959fe75a97c80db9196040d644985..fb0d555878d399c32f1948680e61c282e3f5c543 100644

--- a/ash/test/test_shell_delegate.h

+++ b/ash/test/test_shell_delegate.h

@@ -9,7 +9,7 @@

#include <string>

#include "ash/common/media_delegate.h"

-#include "ash/shell_delegate.h"

+#include "ash/common/shell_delegate.h"

#include "ash/test/test_session_state_delegate.h"

#include "base/macros.h"

#include "base/observer_list.h"

@@ -88,7 +88,7 @@ class TestShellDelegate : public ShellDelegate {

app_list_presenter_delegate_factory_;

std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;

- base::ObserverList<ash::VirtualKeyboardStateObserver>

+ base::ObserverList<VirtualKeyboardStateObserver>

keyboard_state_observer_list_;

DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);

« no previous file with comments | « ash/test/test_keyboard_ui.cc ('k') | ash/wm/ash_focus_rules.cc » ('j') | no next file with comments »