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

Side by Side Diff: components/mus/ws/test_utils.cc

Issue 1770533002: Change userid from a uint32_t to a string guid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@33connector
Patch Set: . Created 4 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
« no previous file with comments | « components/mus/ws/test_utils.h ('k') | components/mus/ws/user_id.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/mus/ws/test_utils.h" 5 #include "components/mus/ws/test_utils.h"
6 6
7 #include "cc/output/copy_output_request.h" 7 #include "cc/output/copy_output_request.h"
8 #include "components/mus/surfaces/surfaces_state.h" 8 #include "components/mus/surfaces/surfaces_state.h"
9 #include "components/mus/ws/display_binding.h" 9 #include "components/mus/ws/display_binding.h"
10 #include "components/mus/ws/window_manager_factory_service.h" 10 #include "components/mus/ws/window_manager_factory_service.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 // WindowManagerFactoryRegistryTestApi ---------------------------------------- 64 // WindowManagerFactoryRegistryTestApi ----------------------------------------
65 65
66 WindowManagerFactoryRegistryTestApi::WindowManagerFactoryRegistryTestApi( 66 WindowManagerFactoryRegistryTestApi::WindowManagerFactoryRegistryTestApi(
67 WindowManagerFactoryRegistry* registry) 67 WindowManagerFactoryRegistry* registry)
68 : registry_(registry) {} 68 : registry_(registry) {}
69 69
70 WindowManagerFactoryRegistryTestApi::~WindowManagerFactoryRegistryTestApi() {} 70 WindowManagerFactoryRegistryTestApi::~WindowManagerFactoryRegistryTestApi() {}
71 71
72 void WindowManagerFactoryRegistryTestApi::AddService( 72 void WindowManagerFactoryRegistryTestApi::AddService(
73 UserId user_id, 73 const UserId& user_id,
74 mojom::WindowManagerFactory* factory) { 74 mojom::WindowManagerFactory* factory) {
75 scoped_ptr<WindowManagerFactoryService> service_ptr( 75 scoped_ptr<WindowManagerFactoryService> service_ptr(
76 new WindowManagerFactoryService(registry_, user_id)); 76 new WindowManagerFactoryService(registry_, user_id));
77 WindowManagerFactoryService* service = service_ptr.get(); 77 WindowManagerFactoryService* service = service_ptr.get();
78 registry_->AddServiceImpl(std::move(service_ptr)); 78 registry_->AddServiceImpl(std::move(service_ptr));
79 service->SetWindowManagerFactoryImpl(factory); 79 service->SetWindowManagerFactoryImpl(factory);
80 } 80 }
81 81
82 // TestPlatformDisplayFactory ------------------------------------------------- 82 // TestPlatformDisplayFactory -------------------------------------------------
83 83
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 Display* display = 271 Display* display =
272 new Display(connection_manager_, nullptr, scoped_refptr<GpuState>(), 272 new Display(connection_manager_, nullptr, scoped_refptr<GpuState>(),
273 scoped_refptr<mus::SurfacesState>()); 273 scoped_refptr<mus::SurfacesState>());
274 display->Init(nullptr); 274 display->Init(nullptr);
275 } 275 }
276 } 276 }
277 277
278 } // namespace test 278 } // namespace test
279 } // namespace ws 279 } // namespace ws
280 } // namespace mus 280 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/ws/test_utils.h ('k') | components/mus/ws/user_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698