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

Side by Side Diff: ui/aura/window.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/app_list/views/page_switcher.cc ('k') | ui/aura/window_unittest.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) 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 "ui/aura/window.h" 5 #include "ui/aura/window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "ui/aura/client/capture_client.h" 16 #include "ui/aura/client/capture_client.h"
17 #include "ui/aura/client/event_client.h" 17 #include "ui/aura/client/event_client.h"
18 #include "ui/aura/client/screen_position_client.h" 18 #include "ui/aura/client/screen_position_client.h"
19 #include "ui/aura/client/stacking_client.h" 19 #include "ui/aura/client/stacking_client.h"
20 #include "ui/aura/client/visibility_client.h" 20 #include "ui/aura/client/visibility_client.h"
21 #include "ui/aura/env.h" 21 #include "ui/aura/env.h"
22 #include "ui/aura/focus_manager.h" 22 #include "ui/aura/focus_manager.h"
23 #include "ui/aura/layout_manager.h" 23 #include "ui/aura/layout_manager.h"
24 #include "ui/aura/root_window.h" 24 #include "ui/aura/root_window.h"
25 #include "ui/aura/window_delegate.h" 25 #include "ui/aura/window_delegate.h"
26 #include "ui/aura/window_observer.h" 26 #include "ui/aura/window_observer.h"
27 #include "ui/aura/window_tracker.h" 27 #include "ui/aura/window_tracker.h"
28 #include "ui/base/animation/multi_animation.h"
29 #include "ui/compositor/compositor.h" 28 #include "ui/compositor/compositor.h"
30 #include "ui/compositor/layer.h" 29 #include "ui/compositor/layer.h"
30 #include "ui/gfx/animation/multi_animation.h"
31 #include "ui/gfx/canvas.h" 31 #include "ui/gfx/canvas.h"
32 #include "ui/gfx/path.h" 32 #include "ui/gfx/path.h"
33 #include "ui/gfx/screen.h" 33 #include "ui/gfx/screen.h"
34 34
35 namespace aura { 35 namespace aura {
36 36
37 Window::Window(WindowDelegate* delegate) 37 Window::Window(WindowDelegate* delegate)
38 : type_(client::WINDOW_TYPE_UNKNOWN), 38 : type_(client::WINDOW_TYPE_UNKNOWN),
39 owned_by_parent_(true), 39 owned_by_parent_(true),
40 delegate_(delegate), 40 delegate_(delegate),
(...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after
1093 bool contains_mouse = false; 1093 bool contains_mouse = false;
1094 if (IsVisible()) { 1094 if (IsVisible()) {
1095 RootWindow* root_window = GetRootWindow(); 1095 RootWindow* root_window = GetRootWindow();
1096 contains_mouse = root_window && 1096 contains_mouse = root_window &&
1097 ContainsPointInRoot(root_window->GetLastMouseLocationInRoot()); 1097 ContainsPointInRoot(root_window->GetLastMouseLocationInRoot());
1098 } 1098 }
1099 return contains_mouse; 1099 return contains_mouse;
1100 } 1100 }
1101 1101
1102 } // namespace aura 1102 } // namespace aura
OLDNEW
« no previous file with comments | « ui/app_list/views/page_switcher.cc ('k') | ui/aura/window_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698