| 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 MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_ | 5 #ifndef SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_ |
| 6 #define MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_ | 6 #define SERVICES_VIEW_MANAGER_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 "cc/surfaces/surface_id.h" | 14 #include "cc/surfaces/surface_id.h" |
| 15 #include "mojo/public/cpp/bindings/callback.h" | 15 #include "mojo/public/cpp/bindings/callback.h" |
| 16 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.
h" | 16 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.
h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 NativeViewportPtr native_viewport_; | 87 NativeViewportPtr native_viewport_; |
| 88 Callback<void()> native_viewport_closed_callback_; | 88 Callback<void()> native_viewport_closed_callback_; |
| 89 base::WeakPtrFactory<DefaultDisplayManager> weak_factory_; | 89 base::WeakPtrFactory<DefaultDisplayManager> weak_factory_; |
| 90 | 90 |
| 91 DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager); | 91 DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager); |
| 92 }; | 92 }; |
| 93 | 93 |
| 94 } // namespace service | 94 } // namespace service |
| 95 } // namespace mojo | 95 } // namespace mojo |
| 96 | 96 |
| 97 #endif // MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_ | 97 #endif // SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_ |
| OLD | NEW |