| OLD | NEW | 
|    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 <stdint.h> | 
 |    9  | 
|    8 #include <map> |   10 #include <map> | 
|    9  |   11  | 
|   10 #include "base/basictypes.h" |   12 #include "base/macros.h" | 
|   11 #include "base/memory/scoped_ptr.h" |   13 #include "base/memory/scoped_ptr.h" | 
|   12 #include "base/memory/weak_ptr.h" |   14 #include "base/memory/weak_ptr.h" | 
|   13 #include "base/timer/timer.h" |   15 #include "base/timer/timer.h" | 
 |   16 #include "build/build_config.h" | 
|   14 #include "components/mus/public/interfaces/window_tree.mojom.h" |   17 #include "components/mus/public/interfaces/window_tree.mojom.h" | 
|   15 #include "components/mus/ws/display_manager_delegate.h" |   18 #include "components/mus/ws/display_manager_delegate.h" | 
|   16 #include "mojo/public/cpp/bindings/callback.h" |   19 #include "mojo/public/cpp/bindings/callback.h" | 
|   17 #include "ui/gfx/geometry/rect.h" |   20 #include "ui/gfx/geometry/rect.h" | 
|   18 #include "ui/platform_window/platform_window_delegate.h" |   21 #include "ui/platform_window/platform_window_delegate.h" | 
|   19  |   22  | 
|   20 namespace cc { |   23 namespace cc { | 
|   21 class CompositorFrame; |   24 class CompositorFrame; | 
|   22 class SurfaceIdAllocator; |   25 class SurfaceIdAllocator; | 
|   23 class SurfaceManager; |   26 class SurfaceManager; | 
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  160   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_; |  163   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_; | 
|  161  |  164  | 
|  162   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager); |  165   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager); | 
|  163 }; |  166 }; | 
|  164  |  167  | 
|  165 }  // namespace ws |  168 }  // namespace ws | 
|  166  |  169  | 
|  167 }  // namespace mus |  170 }  // namespace mus | 
|  168  |  171  | 
|  169 #endif  // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ |  172 #endif  // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ | 
| OLD | NEW |