Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Side by Side Diff: ui/aura_shell/shell.cc

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 1 month 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 | « ui/aura/window.cc ('k') | ui/aura_shell/workspace/workspace.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
23 #include "views/widget/native_widget_aura.h" 24 #include "views/widget/native_widget_aura.h"
24 #include "views/widget/widget.h" 25 #include "views/widget/widget.h"
25 26
26 namespace aura_shell { 27 namespace aura_shell {
27 28
28 namespace { 29 namespace {
29 30
30 // The right/left margin of work area in the screen. 31 // The right/left margin of work area in the screen.
31 const int kWorkAreaHorizontalMargin = 15; 32 const int kWorkAreaHorizontalMargin = 15;
32 33
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 } 181 }
181 182
182 aura::Window* Shell::GetTopmostWindowToActivate(aura::Window* ignore) const { 183 aura::Window* Shell::GetTopmostWindowToActivate(aura::Window* ignore) const {
183 const aura::ToplevelWindowContainer* container = 184 const aura::ToplevelWindowContainer* container =
184 GetContainer(internal::kShellWindowId_DefaultContainer)-> 185 GetContainer(internal::kShellWindowId_DefaultContainer)->
185 AsToplevelWindowContainer(); 186 AsToplevelWindowContainer();
186 return container->GetTopmostWindowToActivate(ignore); 187 return container->GetTopmostWindowToActivate(ignore);
187 } 188 }
188 189
189 } // namespace aura_shell 190 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura/window.cc ('k') | ui/aura_shell/workspace/workspace.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698