ash/shell.cc - Issue 2166793005: Moves accelerator code using common types to ash/common

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: ash/shell.cc

Issue 2166793005: Moves accelerator code using common types to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@debug_commands

Patch Set: not relative 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 unified diff | Download patch

« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/wm/power_button_controller.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "ash/shell.h"	5 #include "ash/shell.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <string>	8 #include <string>

9 #include <utility>	9 #include <utility>

10	10

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

12 #include "ash/accelerators/accelerator_controller_delegate_aura.h"	11 #include "ash/accelerators/accelerator_controller_delegate_aura.h"

13 #include "ash/accelerators/accelerator_delegate.h"	12 #include "ash/accelerators/accelerator_delegate.h"

14 #include "ash/accelerators/focus_manager_factory.h"	13 #include "ash/accelerators/focus_manager_factory.h"

15 #include "ash/aura/wm_shell_aura.h"	14 #include "ash/aura/wm_shell_aura.h"

16 #include "ash/aura/wm_window_aura.h"	15 #include "ash/aura/wm_window_aura.h"

17 #include "ash/autoclick/autoclick_controller.h"	16 #include "ash/autoclick/autoclick_controller.h"

	17 #include "ash/common/accelerators/accelerator_controller.h"

18 #include "ash/common/ash_switches.h"	18 #include "ash/common/ash_switches.h"

19 #include "ash/common/gpu_support.h"	19 #include "ash/common/gpu_support.h"

20 #include "ash/common/keyboard/keyboard_ui.h"	20 #include "ash/common/keyboard/keyboard_ui.h"

21 #include "ash/common/login_status.h"	21 #include "ash/common/login_status.h"

22 #include "ash/common/pointer_down_watcher_delegate.h"	22 #include "ash/common/pointer_down_watcher_delegate.h"

23 #include "ash/common/session/session_state_delegate.h"	23 #include "ash/common/session/session_state_delegate.h"

24 #include "ash/common/shelf/app_list_shelf_item_delegate.h"	24 #include "ash/common/shelf/app_list_shelf_item_delegate.h"

25 #include "ash/common/shelf/shelf_item_delegate.h"	25 #include "ash/common/shelf/shelf_item_delegate.h"

26 #include "ash/common/shelf/shelf_item_delegate_manager.h"	26 #include "ash/common/shelf/shelf_item_delegate_manager.h"

27 #include "ash/common/shelf/shelf_model.h"	27 #include "ash/common/shelf/shelf_model.h"

(...skipping 1099 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1127	1127

1128 void Shell::OnWindowActivated(	1128 void Shell::OnWindowActivated(

1129 aura::client::ActivationChangeObserver::ActivationReason reason,	1129 aura::client::ActivationChangeObserver::ActivationReason reason,

1130 aura::Window* gained_active,	1130 aura::Window* gained_active,

1131 aura::Window* lost_active) {	1131 aura::Window* lost_active) {

1132 if (gained_active)	1132 if (gained_active)

1133 target_root_window_ = gained_active->GetRootWindow();	1133 target_root_window_ = gained_active->GetRootWindow();

1134 }	1134 }

1135	1135

1136 } // namespace ash	1136 } // namespace ash

OLD	NEW