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

Side by Side Diff: components/mus/ws/display_manager.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ 5 #ifndef COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
6 #define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ 6 #define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "components/mus/public/interfaces/window_tree.mojom.h" 14 #include "components/mus/public/interfaces/window_tree.mojom.h"
15 #include "components/mus/ws/display_manager_delegate.h" 15 #include "components/mus/ws/display_manager_delegate.h"
16 #include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" 16 #include "mojo/public/cpp/bindings/callback.h"
17 #include "ui/gfx/geometry/rect.h" 17 #include "ui/gfx/geometry/rect.h"
18 #include "ui/platform_window/platform_window_delegate.h" 18 #include "ui/platform_window/platform_window_delegate.h"
19 19
20 namespace cc { 20 namespace cc {
21 class CompositorFrame; 21 class CompositorFrame;
22 class SurfaceIdAllocator; 22 class SurfaceIdAllocator;
23 class SurfaceManager; 23 class SurfaceManager;
24 } // namespace cc 24 } // namespace cc
25 25
26 namespace gles2 { 26 namespace gles2 {
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 base::WeakPtrFactory<DefaultDisplayManager> weak_factory_; 152 base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
153 153
154 DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager); 154 DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
155 }; 155 };
156 156
157 } // namespace ws 157 } // namespace ws
158 158
159 } // namespace mus 159 } // namespace mus
160 160
161 #endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ 161 #endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « components/mus/ws/connection_manager_delegate.h ('k') | components/mus/ws/display_manager_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698