chrome/browser/ui/browser_commands_chromeos.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/browser_commands_chromeos.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/browser_command_controller.cc ('k') | components/exo/pointer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser_commands_chromeos.cc

diff --git a/chrome/browser/ui/browser_commands_chromeos.cc b/chrome/browser/ui/browser_commands_chromeos.cc

index d6e6dbb83e03e1fea06dbc33cf471529b86e4c04..ecb2f69b71856ce626acfc050f3e759809d665dd 100644

--- a/chrome/browser/ui/browser_commands_chromeos.cc

+++ b/chrome/browser/ui/browser_commands_chromeos.cc

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

#include "chrome/browser/ui/browser_commands_chromeos.h"

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

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

#include "ash/metrics/user_metrics_recorder.h"

#include "ash/screenshot_delegate.h"

#include "ash/shell.h"

@@ -15,8 +15,10 @@ using base::UserMetricsAction;

void TakeScreenshot() {

content::RecordAction(UserMetricsAction("Menu_Take_Screenshot"));

- ash::ScreenshotDelegate* screenshot_delegate = ash::Shell::GetInstance()->

- accelerator_controller()->screenshot_delegate();

+ ash::ScreenshotDelegate* screenshot_delegate =

+ ash::Shell::GetInstance()

+ ->accelerator_controller_delegate()

+ ->screenshot_delegate();

if (screenshot_delegate &&

screenshot_delegate->CanTakeScreenshot()) {

screenshot_delegate->HandleTakeScreenshotForAllRootWindows();