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

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

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 years, 7 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/aura/test/test_windows.cc ('k') | ui/aura/window.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 #ifndef UI_AURA_WINDOW_H_ 5 #ifndef UI_AURA_WINDOW_H_
6 #define UI_AURA_WINDOW_H_ 6 #define UI_AURA_WINDOW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "base/string16.h" 16 #include "base/string16.h"
17 #include "ui/base/events.h"
18 #include "ui/aura/aura_export.h" 17 #include "ui/aura/aura_export.h"
19 #include "ui/aura/client/window_types.h" 18 #include "ui/aura/client/window_types.h"
19 #include "ui/base/events.h"
20 #include "ui/base/gestures/gesture_types.h" 20 #include "ui/base/gestures/gesture_types.h"
21 #include "ui/gfx/compositor/layer_animator.h" 21 #include "ui/compositor/layer_animator.h"
22 #include "ui/gfx/compositor/layer_delegate.h" 22 #include "ui/compositor/layer_delegate.h"
23 #include "ui/gfx/compositor/layer_type.h" 23 #include "ui/compositor/layer_type.h"
24 #include "ui/gfx/insets.h" 24 #include "ui/gfx/insets.h"
25 #include "ui/gfx/native_widget_types.h" 25 #include "ui/gfx/native_widget_types.h"
26 #include "ui/gfx/rect.h" 26 #include "ui/gfx/rect.h"
27 27
28 class SkCanvas; 28 class SkCanvas;
29 29
30 namespace ui { 30 namespace ui {
31 class Layer; 31 class Layer;
32 class Texture; 32 class Texture;
33 class Transform; 33 class Transform;
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 }; 470 };
471 471
472 std::map<const void*, Value> prop_map_; 472 std::map<const void*, Value> prop_map_;
473 473
474 DISALLOW_COPY_AND_ASSIGN(Window); 474 DISALLOW_COPY_AND_ASSIGN(Window);
475 }; 475 };
476 476
477 } // namespace aura 477 } // namespace aura
478 478
479 #endif // UI_AURA_WINDOW_H_ 479 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/aura/test/test_windows.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698