OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "components/exo/display.h" | 5 #include "components/exo/display.h" |
6 | 6 |
7 #include <iterator> | 7 #include <iterator> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
13 #include "base/trace_event/trace_event.h" | 13 #include "base/trace_event/trace_event.h" |
14 #include "base/trace_event/trace_event_argument.h" | 14 #include "base/trace_event/trace_event_argument.h" |
15 #include "components/exo/notification_surface.h" | 15 #include "components/exo/notification_surface.h" |
16 #include "components/exo/notification_surface_manager.h" | 16 #include "components/exo/notification_surface_manager.h" |
17 #include "components/exo/shared_memory.h" | 17 #include "components/exo/shared_memory.h" |
18 #include "components/exo/shell_surface.h" | 18 #include "components/exo/shell_surface.h" |
19 #include "components/exo/sub_surface.h" | 19 #include "components/exo/sub_surface.h" |
20 #include "components/exo/surface.h" | 20 #include "components/exo/surface.h" |
21 #include "components/exo/wm_helper.h" | |
reveman
2016/08/17 21:10:05
nit: remove if not needed
Peng
2016/08/17 21:29:58
Done.
| |
21 #include "ui/views/widget/widget.h" | 22 #include "ui/views/widget/widget.h" |
22 | 23 |
23 #if defined(USE_OZONE) | 24 #if defined(USE_OZONE) |
24 #include <GLES2/gl2extchromium.h> | 25 #include <GLES2/gl2extchromium.h> |
25 #include "components/exo/buffer.h" | 26 #include "components/exo/buffer.h" |
26 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" | 27 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
27 #include "third_party/khronos/GLES2/gl2.h" | 28 #include "third_party/khronos/GLES2/gl2.h" |
28 #include "third_party/khronos/GLES2/gl2ext.h" | 29 #include "third_party/khronos/GLES2/gl2ext.h" |
29 #include "ui/aura/env.h" | 30 #include "ui/aura/env.h" |
30 #endif | 31 #endif |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
191 notification_surface_manager_->GetSurface(notification_id)) { | 192 notification_surface_manager_->GetSurface(notification_id)) { |
192 DLOG(ERROR) << "Invalid notification id, id=" << notification_id; | 193 DLOG(ERROR) << "Invalid notification id, id=" << notification_id; |
193 return nullptr; | 194 return nullptr; |
194 } | 195 } |
195 | 196 |
196 return base::MakeUnique<NotificationSurface>(notification_surface_manager_, | 197 return base::MakeUnique<NotificationSurface>(notification_surface_manager_, |
197 surface, notification_id); | 198 surface, notification_id); |
198 } | 199 } |
199 | 200 |
200 } // namespace exo | 201 } // namespace exo |
OLD | NEW |