Chromium Code Reviews| 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" | |
| 16 #include "components/exo/notification_surface_manager.h" | |
| 15 #include "components/exo/shared_memory.h" | 17 #include "components/exo/shared_memory.h" |
| 16 #include "components/exo/shell_surface.h" | 18 #include "components/exo/shell_surface.h" |
| 17 #include "components/exo/sub_surface.h" | 19 #include "components/exo/sub_surface.h" |
| 18 #include "components/exo/surface.h" | 20 #include "components/exo/surface.h" |
| 19 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
| 20 | 22 |
| 21 #if defined(USE_OZONE) | 23 #if defined(USE_OZONE) |
| 22 #include <GLES2/gl2extchromium.h> | 24 #include <GLES2/gl2extchromium.h> |
| 23 #include "components/exo/buffer.h" | 25 #include "components/exo/buffer.h" |
| 24 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" | 26 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 172 } | 174 } |
| 173 | 175 |
| 174 if (surface->HasSurfaceDelegate()) { | 176 if (surface->HasSurfaceDelegate()) { |
| 175 DLOG(ERROR) << "Surface has already been assigned a role"; | 177 DLOG(ERROR) << "Surface has already been assigned a role"; |
| 176 return nullptr; | 178 return nullptr; |
| 177 } | 179 } |
| 178 | 180 |
| 179 return base::WrapUnique(new SubSurface(surface, parent)); | 181 return base::WrapUnique(new SubSurface(surface, parent)); |
| 180 } | 182 } |
| 181 | 183 |
| 184 std::unique_ptr<NotificationSurface> Display::CreateNotificationSurface( | |
| 185 Surface* surface, | |
| 186 const std::string& notification_id) { | |
| 187 TRACE_EVENT2("exo", "Display::CreateNotificationSurface", "surface", | |
| 188 surface->AsTracedValue(), "notification_id", notification_id); | |
| 189 | |
| 190 if (notification_surface_manager_ && | |
|
reveman
2016/06/23 16:34:52
nit: please fail if "!notification_surface_manager
xiyuan
2016/06/23 17:46:09
Done.
| |
| 191 notification_surface_manager_->GetSurface(notification_id) != nullptr) { | |
|
reveman
2016/06/23 16:34:52
nit: s/GetSurface(notification_id) != nullptr/GetS
xiyuan
2016/06/23 17:46:09
Done.
| |
| 192 DLOG(ERROR) << "Invalid notification id, id=" << notification_id; | |
| 193 return nullptr; | |
| 194 } | |
| 195 | |
| 196 return base::WrapUnique(new NotificationSurface( | |
| 197 notification_surface_manager_.get(), surface, notification_id)); | |
| 198 } | |
| 199 | |
| 200 void Display::SetNotificationSurfaceManager( | |
| 201 std::unique_ptr<NotificationSurfaceManager> notification_surface_manager) { | |
| 202 notification_surface_manager_ = std::move(notification_surface_manager); | |
| 203 } | |
| 204 | |
| 182 } // namespace exo | 205 } // namespace exo |
| OLD | NEW |