chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc - Issue 2192613002: Moves NewWindowDelegate to ash/common

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/webui/settings/chromeos/device_keyboard_handler.cc

Issue 2192613002: Moves NewWindowDelegate to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: order 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

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc ('k') | components/arc/intent_helper/arc_intent_helper_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc

diff --git a/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc

index 84867f5e947ed4f2b9a64be131152be8f5ba8cbb..d2e5704758a7ab0faf99f417c94dbbc2d8169efd 100644

--- a/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc

+++ b/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc

@@ -4,8 +4,8 @@

#include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"

-#include "ash/new_window_delegate.h"

-#include "ash/shell.h"

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

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

#include "base/bind.h"

#include "base/command_line.h"

#include "base/values.h"

@@ -67,7 +67,7 @@ void KeyboardHandler::HandleInitialize(const base::ListValue* args) {

void KeyboardHandler::HandleShowKeyboardShortcutsOverlay(

const base::ListValue* args) const {

- ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay();

+ ash::WmShell::Get()->new_window_delegate()->ShowKeyboardOverlay();

}

void KeyboardHandler::UpdateShowKeys() {