| 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/shared_memory.h" | 16 #include "components/exo/shared_memory.h" |
| 16 #include "components/exo/shell_surface.h" | 17 #include "components/exo/shell_surface.h" |
| 17 #include "components/exo/sub_surface.h" | 18 #include "components/exo/sub_surface.h" |
| 18 #include "components/exo/surface.h" | 19 #include "components/exo/surface.h" |
| 19 #include "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
| 20 | 21 |
| 21 #if defined(USE_OZONE) | 22 #if defined(USE_OZONE) |
| 22 #include <GLES2/gl2extchromium.h> | 23 #include <GLES2/gl2extchromium.h> |
| 23 #include "components/exo/buffer.h" | 24 #include "components/exo/buffer.h" |
| 24 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" | 25 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 } | 179 } |
| 179 | 180 |
| 180 if (surface->HasSurfaceDelegate()) { | 181 if (surface->HasSurfaceDelegate()) { |
| 181 DLOG(ERROR) << "Surface has already been assigned a role"; | 182 DLOG(ERROR) << "Surface has already been assigned a role"; |
| 182 return nullptr; | 183 return nullptr; |
| 183 } | 184 } |
| 184 | 185 |
| 185 return base::WrapUnique(new SubSurface(surface, parent)); | 186 return base::WrapUnique(new SubSurface(surface, parent)); |
| 186 } | 187 } |
| 187 | 188 |
| 189 std::unique_ptr<NotificationSurface> Display::CreateNotificationSurface( |
| 190 Surface* surface, |
| 191 const std::string& notification_id) { |
| 192 TRACE_EVENT2("exo", "Display::CreateNotificationSurface", "surface", |
| 193 surface->AsTracedValue(), "notification_id", notification_id); |
| 194 |
| 195 return base::WrapUnique(new NotificationSurface(surface, notification_id)); |
| 196 } |
| 197 |
| 188 } // namespace exo | 198 } // namespace exo |
| OLD | NEW |