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

Side by Side Diff: ash/common/mojo_interface_factory.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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/autoclick/mus/main.cc ('k') | ash/common/system/tray/system_tray_controller.cc » ('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/common/mojo_interface_factory.h" 5 #include "ash/common/mojo_interface_factory.h"
6 6
7 #include "ash/common/shelf/shelf_controller.h" 7 #include "ash/common/shelf/shelf_controller.h"
8 #include "ash/common/system/tray/system_tray_controller.h" 8 #include "ash/common/system/tray/system_tray_controller.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "services/shell/public/cpp/interface_registry.h" 11 #include "services/service_manager/public/cpp/interface_registry.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 namespace { 15 namespace {
16 16
17 void BindShelfControllerRequestOnMainThread( 17 void BindShelfControllerRequestOnMainThread(
18 mojom::ShelfControllerRequest request) { 18 mojom::ShelfControllerRequest request) {
19 WmShell::Get()->shelf_controller()->BindRequest(std::move(request)); 19 WmShell::Get()->shelf_controller()->BindRequest(std::move(request));
20 } 20 }
21 21
(...skipping 10 matching lines...) Expand all
32 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner) { 32 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner) {
33 registry->AddInterface(base::Bind(&BindShelfControllerRequestOnMainThread), 33 registry->AddInterface(base::Bind(&BindShelfControllerRequestOnMainThread),
34 main_thread_task_runner); 34 main_thread_task_runner);
35 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), 35 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread),
36 main_thread_task_runner); 36 main_thread_task_runner);
37 } 37 }
38 38
39 } // namespace mojo_interface_factory 39 } // namespace mojo_interface_factory
40 40
41 } // namespace ash 41 } // namespace ash
OLDNEW
« no previous file with comments | « ash/autoclick/mus/main.cc ('k') | ash/common/system/tray/system_tray_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698