ash/common/accelerators/ash_focus_manager_factory.h - Issue 2187703003: Wires up registering accelerators from mash with the wm

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/common/accelerators/ash_focus_manager_factory.h

Issue 2187703003: Wires up registering accelerators from mash with the wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge 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/common/accelerators/ash_focus_manager_factory.h

diff --git a/ash/accelerators/focus_manager_factory.h b/ash/common/accelerators/ash_focus_manager_factory.h

similarity index 84%

rename from ash/accelerators/focus_manager_factory.h

rename to ash/common/accelerators/ash_focus_manager_factory.h

index 188b8c1568bb99fb1ff75ec553ded8cc2030f65e..32d9e9a42c5c3e3c1ac4157d1151471b0e96acfb 100644

--- a/ash/accelerators/focus_manager_factory.h

+++ b/ash/common/accelerators/ash_focus_manager_factory.h

@@ -2,10 +2,9 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_

-#define ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_

+#ifndef ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_

+#define ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_

-#include "base/compiler_specific.h"

#include "base/macros.h"

#include "ui/views/focus/focus_manager_delegate.h"

#include "ui/views/focus/focus_manager_factory.h"

@@ -36,4 +35,4 @@ class AshFocusManagerFactory : public views::FocusManagerFactory {

} // namespace ash

-#endif // ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_

+#endif // ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_

« no previous file with comments | « ash/common/accelerators/accelerator_controller.cc ('k') | ash/common/accelerators/ash_focus_manager_factory.cc » ('j') | no next file with comments »