| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/aura_shell/shell.h" | 5 #include "ui/aura_shell/shell.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "ui/aura/desktop.h" | 8 #include "ui/aura/desktop.h" |
| 9 #include "ui/aura/screen_aura.h" | 9 #include "ui/aura/screen_aura.h" |
| 10 #include "ui/aura/toplevel_window_container.h" | 10 #include "ui/aura/toplevel_window_container.h" |
| 11 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 12 #include "ui/aura/window_types.h" | 12 #include "ui/aura/window_types.h" |
| 13 #include "ui/aura_shell/default_container_event_filter.h" | 13 #include "ui/aura_shell/default_container_event_filter.h" |
| 14 #include "ui/aura_shell/default_container_layout_manager.h" | 14 #include "ui/aura_shell/default_container_layout_manager.h" |
| 15 #include "ui/aura_shell/desktop_layout_manager.h" | 15 #include "ui/aura_shell/desktop_layout_manager.h" |
| 16 #include "ui/aura_shell/launcher/launcher.h" | 16 #include "ui/aura_shell/launcher/launcher.h" |
| 17 #include "ui/aura_shell/shell_delegate.h" | 17 #include "ui/aura_shell/shell_delegate.h" |
| 18 #include "ui/aura_shell/shell_factory.h" | 18 #include "ui/aura_shell/shell_factory.h" |
| 19 #include "ui/aura_shell/shell_window_ids.h" | 19 #include "ui/aura_shell/shell_window_ids.h" |
| 20 #include "ui/aura_shell/workspace/workspace_manager.h" | 20 #include "ui/aura_shell/workspace/workspace_manager.h" |
| 21 #include "ui/base/view_prop.h" | 21 #include "ui/base/view_prop.h" |
| 22 #include "ui/gfx/compositor/layer.h" | 22 #include "ui/gfx/compositor/layer.h" |
| 23 #include "ui/gfx/compositor/layer_animator.h" | |
| 24 #include "views/widget/native_widget_aura.h" | 23 #include "views/widget/native_widget_aura.h" |
| 25 #include "views/widget/widget.h" | 24 #include "views/widget/widget.h" |
| 26 | 25 |
| 27 namespace aura_shell { | 26 namespace aura_shell { |
| 28 | 27 |
| 29 namespace { | 28 namespace { |
| 30 | 29 |
| 31 // The right/left margin of work area in the screen. | 30 // The right/left margin of work area in the screen. |
| 32 const int kWorkAreaHorizontalMargin = 15; | 31 const int kWorkAreaHorizontalMargin = 15; |
| 33 | 32 |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 } | 180 } |
| 182 | 181 |
| 183 aura::Window* Shell::GetTopmostWindowToActivate(aura::Window* ignore) const { | 182 aura::Window* Shell::GetTopmostWindowToActivate(aura::Window* ignore) const { |
| 184 const aura::ToplevelWindowContainer* container = | 183 const aura::ToplevelWindowContainer* container = |
| 185 GetContainer(internal::kShellWindowId_DefaultContainer)-> | 184 GetContainer(internal::kShellWindowId_DefaultContainer)-> |
| 186 AsToplevelWindowContainer(); | 185 AsToplevelWindowContainer(); |
| 187 return container->GetTopmostWindowToActivate(ignore); | 186 return container->GetTopmostWindowToActivate(ignore); |
| 188 } | 187 } |
| 189 | 188 |
| 190 } // namespace aura_shell | 189 } // namespace aura_shell |
| OLD | NEW |