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

Side by Side Diff: ash/sysui/sysui_application.cc

Issue 2215133002: Change signature of OnConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: . Created 4 years, 4 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 | « ash/sysui/sysui_application.h ('k') | ash/touch_hud/mus/touch_hud_application.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 "ash/sysui/sysui_application.h" 5 #include "ash/sysui/sysui_application.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 315
316 void SysUIApplication::OnStart(const ::shell::Identity& identity) { 316 void SysUIApplication::OnStart(const ::shell::Identity& identity) {
317 ash_init_.reset(new AshInit()); 317 ash_init_.reset(new AshInit());
318 ash_init_->Initialize(connector(), identity); 318 ash_init_->Initialize(connector(), identity);
319 319
320 ui::mojom::InputDeviceServerPtr server; 320 ui::mojom::InputDeviceServerPtr server;
321 connector()->ConnectToInterface("mojo:ui", &server); 321 connector()->ConnectToInterface("mojo:ui", &server);
322 input_device_client_.Connect(std::move(server)); 322 input_device_client_.Connect(std::move(server));
323 } 323 }
324 324
325 bool SysUIApplication::OnConnect(::shell::Connection* connection) { 325 bool SysUIApplication::OnConnect(const ::shell::Identity& remote_identity,
326 connection->AddInterface<mash::shelf::mojom::ShelfController>(this); 326 ::shell::InterfaceRegistry* registry) {
327 connection->AddInterface<mojom::WallpaperController>(this); 327 registry->AddInterface<mash::shelf::mojom::ShelfController>(this);
328 registry->AddInterface<mojom::WallpaperController>(this);
328 return true; 329 return true;
329 } 330 }
330 331
331 void SysUIApplication::Create( 332 void SysUIApplication::Create(
332 const ::shell::Identity& remote_identity, 333 const ::shell::Identity& remote_identity,
333 mash::shelf::mojom::ShelfControllerRequest request) { 334 mash::shelf::mojom::ShelfControllerRequest request) {
334 mash::shelf::mojom::ShelfController* shelf_controller = 335 mash::shelf::mojom::ShelfController* shelf_controller =
335 static_cast<ShelfDelegateMus*>(WmShell::Get()->shelf_delegate()); 336 static_cast<ShelfDelegateMus*>(WmShell::Get()->shelf_delegate());
336 DCHECK(shelf_controller); 337 DCHECK(shelf_controller);
337 shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request)); 338 shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
338 } 339 }
339 340
340 void SysUIApplication::Create(const ::shell::Identity& remote_identity, 341 void SysUIApplication::Create(const ::shell::Identity& remote_identity,
341 mojom::WallpaperControllerRequest request) { 342 mojom::WallpaperControllerRequest request) {
342 mojom::WallpaperController* wallpaper_controller = 343 mojom::WallpaperController* wallpaper_controller =
343 static_cast<UserWallpaperDelegateMus*>( 344 static_cast<UserWallpaperDelegateMus*>(
344 Shell::GetInstance()->user_wallpaper_delegate()); 345 Shell::GetInstance()->user_wallpaper_delegate());
345 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, 346 wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
346 std::move(request)); 347 std::move(request));
347 } 348 }
348 349
349 } // namespace sysui 350 } // namespace sysui
350 } // namespace ash 351 } // namespace ash
OLDNEW
« no previous file with comments | « ash/sysui/sysui_application.h ('k') | ash/touch_hud/mus/touch_hud_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698