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

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

Issue 2306003002: Set name for WindowTree of WindowManager (Closed)
Patch Set: Set name for WindowTree of WindowManager 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
« no previous file with comments | « no previous file | services/ui/ws/window_manager_window_tree_factory.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 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"
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 AddUserIfNecessary(remote_identity); 310 AddUserIfNecessary(remote_identity);
311 const ws::UserId& user_id = remote_identity.user_id(); 311 const ws::UserId& user_id = remote_identity.user_id();
312 window_server_->GetUserActivityMonitorForUser(user_id)->Add( 312 window_server_->GetUserActivityMonitorForUser(user_id)->Add(
313 std::move(request)); 313 std::move(request));
314 } 314 }
315 315
316 void Service::Create(const shell::Identity& remote_identity, 316 void Service::Create(const shell::Identity& remote_identity,
317 mojom::WindowManagerWindowTreeFactoryRequest request) { 317 mojom::WindowManagerWindowTreeFactoryRequest request) {
318 AddUserIfNecessary(remote_identity); 318 AddUserIfNecessary(remote_identity);
319 window_server_->window_manager_window_tree_factory_set()->Add( 319 window_server_->window_manager_window_tree_factory_set()->Add(
320 remote_identity.user_id(), std::move(request)); 320 remote_identity.user_id(), remote_identity.name(), std::move(request));
sky 2016/09/02 14:20:39 Can you outline why are doing this change? The ide
321 } 321 }
322 322
323 void Service::Create(const shell::Identity& remote_identity, 323 void Service::Create(const shell::Identity& remote_identity,
324 mojom::WindowTreeFactoryRequest request) { 324 mojom::WindowTreeFactoryRequest request) {
325 AddUserIfNecessary(remote_identity); 325 AddUserIfNecessary(remote_identity);
326 if (!window_server_->display_manager()->has_displays()) { 326 if (!window_server_->display_manager()->has_displays()) {
327 std::unique_ptr<PendingRequest> pending_request(new PendingRequest); 327 std::unique_ptr<PendingRequest> pending_request(new PendingRequest);
328 pending_request->remote_identity = remote_identity; 328 pending_request->remote_identity = remote_identity;
329 pending_request->wtf_request.reset( 329 pending_request->wtf_request.reset(
330 new mojom::WindowTreeFactoryRequest(std::move(request))); 330 new mojom::WindowTreeFactoryRequest(std::move(request)));
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 // Display manages its own lifetime. 362 // Display manages its own lifetime.
363 ws::Display* host_impl = 363 ws::Display* host_impl =
364 new ws::Display(window_server_.get(), platform_display_init_params_); 364 new ws::Display(window_server_.get(), platform_display_init_params_);
365 host_impl->Init(nullptr); 365 host_impl->Init(nullptr);
366 366
367 if (touch_controller_) 367 if (touch_controller_)
368 touch_controller_->UpdateTouchTransforms(); 368 touch_controller_->UpdateTouchTransforms();
369 } 369 }
370 370
371 } // namespace ui 371 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | services/ui/ws/window_manager_window_tree_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698