ash/test/ash_test_helper.cc - Issue 2162193003: Separates out accelerators using non-common types

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/ash_test_helper.cc

Issue 2162193003: Separates out accelerators using non-common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@accelerators

Patch Set: sim=20 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/ash_test_helper.cc

diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc

index acdf42eaa3d9b3af539d0832164ce1a8ad7df672..50d4475e49f4cd2f4b91a95af29d3351a9167033 100644

--- a/ash/test/ash_test_helper.cc

+++ b/ash/test/ash_test_helper.cc

@@ -4,7 +4,7 @@

#include "ash/test/ash_test_helper.h"

-#include "ash/accelerators/accelerator_controller.h"

+#include "ash/accelerators/accelerator_controller_delegate_aura.h"

#include "ash/common/ash_switches.h"

#include "ash/common/display/display_info.h"

#include "ash/common/material_design/material_design_controller.h"

@@ -145,7 +145,7 @@ void AshTestHelper::SetUp(bool start_session) {

ShellTestApi(shell).DisableDisplayAnimator();

test_screenshot_delegate_ = new TestScreenshotDelegate();

- shell->accelerator_controller()->SetScreenshotDelegate(

+ shell->accelerator_controller_delegate()->SetScreenshotDelegate(

std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));

}

« no previous file with comments | « ash/shell.cc ('k') | ash/wm/window_util.h » ('j') | no next file with comments »