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

Side by Side Diff: services/ui/service.cc

Issue 2273193002: Make compositor_frame.h NOT include base/trace_event/trace_event.h (Closed)
Patch Set: Fix Created 4 years, 3 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 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 #include "services/ui/service.h" 5 #include "services/ui/service.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/threading/platform_thread.h" 13 #include "base/threading/platform_thread.h"
14 #include "base/trace_event/trace_event.h"
14 #include "build/build_config.h" 15 #include "build/build_config.h"
15 #include "services/catalog/public/cpp/resource_loader.h" 16 #include "services/catalog/public/cpp/resource_loader.h"
16 #include "services/shell/public/c/main.h" 17 #include "services/shell/public/c/main.h"
17 #include "services/shell/public/cpp/connection.h" 18 #include "services/shell/public/cpp/connection.h"
18 #include "services/shell/public/cpp/connector.h" 19 #include "services/shell/public/cpp/connector.h"
19 #include "services/tracing/public/cpp/provider.h" 20 #include "services/tracing/public/cpp/provider.h"
20 #include "services/ui/clipboard/clipboard_impl.h" 21 #include "services/ui/clipboard/clipboard_impl.h"
21 #include "services/ui/common/switches.h" 22 #include "services/ui/common/switches.h"
22 #include "services/ui/display/platform_screen.h" 23 #include "services/ui/display/platform_screen.h"
23 #include "services/ui/gpu/gpu_service_impl.h" 24 #include "services/ui/gpu/gpu_service_impl.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 // Display manages its own lifetime. 363 // Display manages its own lifetime.
363 ws::Display* host_impl = 364 ws::Display* host_impl =
364 new ws::Display(window_server_.get(), platform_display_init_params_); 365 new ws::Display(window_server_.get(), platform_display_init_params_);
365 host_impl->Init(nullptr); 366 host_impl->Init(nullptr);
366 367
367 if (touch_controller_) 368 if (touch_controller_)
368 touch_controller_->UpdateTouchTransforms(); 369 touch_controller_->UpdateTouchTransforms();
369 } 370 }
370 371
371 } // namespace ui 372 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698