Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(826)

Side by Side Diff: components/exo/display.cc

Issue 2723143002: Add unittests of ArcCustomNotificationView (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/public/cpp/shell_window_ids.h" 10 #include "ash/public/cpp/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_impl.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 "ui/views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
22 #include "ui/wm/core/coordinate_conversion.h" 22 #include "ui/wm/core/coordinate_conversion.h"
23 23
24 #if defined(USE_OZONE) 24 #if defined(USE_OZONE)
25 #include <GLES2/gl2extchromium.h> 25 #include <GLES2/gl2extchromium.h>
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 const std::string& notification_id) { 220 const std::string& notification_id) {
221 TRACE_EVENT2("exo", "Display::CreateNotificationSurface", "surface", 221 TRACE_EVENT2("exo", "Display::CreateNotificationSurface", "surface",
222 surface->AsTracedValue(), "notification_id", notification_id); 222 surface->AsTracedValue(), "notification_id", notification_id);
223 223
224 if (!notification_surface_manager_ || 224 if (!notification_surface_manager_ ||
225 notification_surface_manager_->GetSurface(notification_id)) { 225 notification_surface_manager_->GetSurface(notification_id)) {
226 DLOG(ERROR) << "Invalid notification id, id=" << notification_id; 226 DLOG(ERROR) << "Invalid notification id, id=" << notification_id;
227 return nullptr; 227 return nullptr;
228 } 228 }
229 229
230 return base::MakeUnique<NotificationSurface>(notification_surface_manager_, 230 return base::MakeUnique<NotificationSurfaceImpl>(
231 surface, notification_id); 231 notification_surface_manager_, surface, notification_id);
232 } 232 }
233 233
234 } // namespace exo 234 } // namespace exo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698