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

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

Issue 1965073002: Rename gfx::Display to display::Display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
« no previous file with comments | « ui/aura/test/test_screen.h ('k') | ui/display/BUILD.gn » ('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 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 12 matching lines...) Expand all
23 #include "ui/compositor/layer_owner.h" 23 #include "ui/compositor/layer_owner.h"
24 #include "ui/events/event_constants.h" 24 #include "ui/events/event_constants.h"
25 #include "ui/events/event_target.h" 25 #include "ui/events/event_target.h"
26 #include "ui/events/event_targeter.h" 26 #include "ui/events/event_targeter.h"
27 #include "ui/events/gestures/gesture_types.h" 27 #include "ui/events/gestures/gesture_types.h"
28 #include "ui/gfx/geometry/insets.h" 28 #include "ui/gfx/geometry/insets.h"
29 #include "ui/gfx/geometry/rect.h" 29 #include "ui/gfx/geometry/rect.h"
30 #include "ui/gfx/native_widget_types.h" 30 #include "ui/gfx/native_widget_types.h"
31 #include "ui/wm/public/window_types.h" 31 #include "ui/wm/public/window_types.h"
32 32
33 namespace gfx { 33 namespace display {
34 class Display; 34 class Display;
35 } 35 }
36 36
37 namespace display {
38 using Display = gfx::Display;
39 }
40
41 namespace gfx { 37 namespace gfx {
42 class Transform; 38 class Transform;
43 class Vector2d; 39 class Vector2d;
44 } 40 }
45 41
46 namespace ui { 42 namespace ui {
47 class EventHandler; 43 class EventHandler;
48 class Layer; 44 class Layer;
49 class TextInputClient; 45 class TextInputClient;
50 class Texture; 46 class Texture;
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 }; 520 };
525 521
526 std::map<const void*, Value> prop_map_; 522 std::map<const void*, Value> prop_map_;
527 523
528 DISALLOW_COPY_AND_ASSIGN(Window); 524 DISALLOW_COPY_AND_ASSIGN(Window);
529 }; 525 };
530 526
531 } // namespace aura 527 } // namespace aura
532 528
533 #endif // UI_AURA_WINDOW_H_ 529 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/aura/test/test_screen.h ('k') | ui/display/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698