chrome/browser/ui/ash/ash_init.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: chrome/browser/ui/ash/ash_init.cc

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

Patch Set: fix compile issues 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

« ash/accelerators/accelerator_controller_delegate_aura.cc ('K') | « chrome/browser/ui/ash/accelerator_commands_browsertest.cc ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/ash_init.cc

diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc

index 17b4c36401186ea64a30c4c8d60253036fb1b0ff..64a2426011ea7acc48a86ae1b1591a42aa662106 100644

--- a/chrome/browser/ui/ash/ash_init.cc

+++ b/chrome/browser/ui/ash/ash_init.cc

@@ -5,6 +5,7 @@

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

#include "ash/accelerators/accelerator_controller.h"

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

#include "ash/autoclick/autoclick_controller.h"

#include "ash/common/accessibility_types.h"

#include "ash/common/ash_switches.h"

@@ -71,7 +72,7 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {

shell_init_params.blocking_pool = content::BrowserThread::GetBlockingPool();

ash::Shell* shell = ash::Shell::CreateInstance(shell_init_params);

- shell->accelerator_controller()->SetScreenshotDelegate(

+ shell->accelerator_controller_delegate()->SetScreenshotDelegate(

std::unique_ptr<ash::ScreenshotDelegate>(new ChromeScreenshotGrabber));

shell->autoclick_controller()->SetDelegate(

base::WrapUnique(new chromeos::AutoclickRingHandler()));