athena/input/accelerator_manager_impl.cc - Issue 558483003: Rename athena/common to athena/util

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: athena/input/accelerator_manager_impl.cc

Issue 558483003: Rename athena/common to athena/util (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: revert unnecessary change Created 6 years, 3 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 unified diff | Download patch

« no previous file with comments | « athena/home/home_card_impl.cc ('k') | athena/screen/screen_manager_impl.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "athena/input/accelerator_manager_impl.h"	5 #include "athena/input/accelerator_manager_impl.h"

6	6

7 #include "athena/common/switches.h"

8 #include "athena/input/public/input_manager.h"	7 #include "athena/input/public/input_manager.h"

	8 #include "athena/util/switches.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "ui/aura/window.h"	10 #include "ui/aura/window.h"

11 #include "ui/base/accelerators/accelerator_manager.h"	11 #include "ui/base/accelerators/accelerator_manager.h"

12 #include "ui/events/event.h"	12 #include "ui/events/event.h"

13 #include "ui/events/event_target.h"	13 #include "ui/events/event_target.h"

14 #include "ui/views/focus/focus_manager.h"	14 #include "ui/views/focus/focus_manager.h"

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

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

17 #include "ui/wm/core/accelerator_delegate.h"	17 #include "ui/wm/core/accelerator_delegate.h"

18 #include "ui/wm/core/accelerator_filter.h"	18 #include "ui/wm/core/accelerator_filter.h"

(...skipping 310 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
329 return InputManager::Get()->GetAcceleratorManager();	329 return InputManager::Get()->GetAcceleratorManager();

330 }	330 }

331	331

332 // static	332 // static

333 scoped_ptr<AcceleratorManager> AcceleratorManager::CreateForFocusManager(	333 scoped_ptr<AcceleratorManager> AcceleratorManager::CreateForFocusManager(

334 views::FocusManager* focus_manager) {	334 views::FocusManager* focus_manager) {

335 return AcceleratorManagerImpl::CreateForFocusManager(focus_manager).Pass();	335 return AcceleratorManagerImpl::CreateForFocusManager(focus_manager).Pass();

336 }	336 }

337	337

338 } // namespace athena	338 } // namespace athena

OLD	NEW