ash/shell.cc - Issue 174803002: Move root_window.* to window_event_dispatcher.*

Side by Side Diff: ash/shell.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shell/content_client/shell_browser_main_parts.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	9

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

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 #include "ash/wm/window_properties.h"	79 #include "ash/wm/window_properties.h"

80 #include "ash/wm/window_util.h"	80 #include "ash/wm/window_util.h"

81 #include "ash/wm/workspace_controller.h"	81 #include "ash/wm/workspace_controller.h"

82 #include "base/bind.h"	82 #include "base/bind.h"

83 #include "base/command_line.h"	83 #include "base/command_line.h"

84 #include "base/debug/trace_event.h"	84 #include "base/debug/trace_event.h"

85 #include "ui/aura/client/aura_constants.h"	85 #include "ui/aura/client/aura_constants.h"

86 #include "ui/aura/client/user_action_client.h"	86 #include "ui/aura/client/user_action_client.h"

87 #include "ui/aura/env.h"	87 #include "ui/aura/env.h"

88 #include "ui/aura/layout_manager.h"	88 #include "ui/aura/layout_manager.h"

89 #include "ui/aura/root_window.h"

90 #include "ui/aura/window.h"	89 #include "ui/aura/window.h"

	90 #include "ui/aura/window_event_dispatcher.h"

91 #include "ui/base/ui_base_switches.h"	91 #include "ui/base/ui_base_switches.h"

92 #include "ui/compositor/layer.h"	92 #include "ui/compositor/layer.h"

93 #include "ui/compositor/layer_animator.h"	93 #include "ui/compositor/layer_animator.h"

94 #include "ui/events/event_target_iterator.h"	94 #include "ui/events/event_target_iterator.h"

95 #include "ui/gfx/display.h"	95 #include "ui/gfx/display.h"

96 #include "ui/gfx/image/image_skia.h"	96 #include "ui/gfx/image/image_skia.h"

97 #include "ui/gfx/screen.h"	97 #include "ui/gfx/screen.h"

98 #include "ui/gfx/size.h"	98 #include "ui/gfx/size.h"

99 #include "ui/keyboard/keyboard.h"	99 #include "ui/keyboard/keyboard.h"

100 #include "ui/keyboard/keyboard_controller.h"	100 #include "ui/keyboard/keyboard_controller.h"

(...skipping 987 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1088 ////////////////////////////////////////////////////////////////////////////////	1088 ////////////////////////////////////////////////////////////////////////////////

1089 // Shell, aura::client::ActivationChangeObserver implementation:	1089 // Shell, aura::client::ActivationChangeObserver implementation:

1090	1090

1091 void Shell::OnWindowActivated(aura::Window* gained_active,	1091 void Shell::OnWindowActivated(aura::Window* gained_active,

1092 aura::Window* lost_active) {	1092 aura::Window* lost_active) {

1093 if (gained_active)	1093 if (gained_active)

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

1095 }	1095 }

1096	1096

1097 } // namespace ash	1097 } // namespace ash

OLD	NEW