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

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

Issue 2750483005: Moves app_list() and related functions from Shell to WmShell (Closed)
Patch Set: dont explicitly delete Created 3 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 | « ash/common/accelerators/accelerator_router.cc ('k') | ash/common/shelf/app_list_button.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 <utility> 7 #include <utility>
8 8
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/cast_config_controller.h" 10 #include "ash/common/cast_config_controller.h"
(...skipping 17 matching lines...) Expand all
28 namespace ash { 28 namespace ash {
29 29
30 namespace { 30 namespace {
31 31
32 void BindAcceleratorControllerRequestOnMainThread( 32 void BindAcceleratorControllerRequestOnMainThread(
33 mojom::AcceleratorControllerRequest request) { 33 mojom::AcceleratorControllerRequest request) {
34 WmShell::Get()->accelerator_controller()->BindRequest(std::move(request)); 34 WmShell::Get()->accelerator_controller()->BindRequest(std::move(request));
35 } 35 }
36 36
37 void BindAppListRequestOnMainThread(app_list::mojom::AppListRequest request) { 37 void BindAppListRequestOnMainThread(app_list::mojom::AppListRequest request) {
38 WmShell::Get()->app_list()->BindRequest(std::move(request)); 38 Shell::Get()->app_list()->BindRequest(std::move(request));
39 } 39 }
40 40
41 void BindCastConfigOnMainThread(mojom::CastConfigRequest request) { 41 void BindCastConfigOnMainThread(mojom::CastConfigRequest request) {
42 WmShell::Get()->cast_config()->BindRequest(std::move(request)); 42 WmShell::Get()->cast_config()->BindRequest(std::move(request));
43 } 43 }
44 44
45 void BindLocaleNotificationControllerOnMainThread( 45 void BindLocaleNotificationControllerOnMainThread(
46 mojom::LocaleNotificationControllerRequest request) { 46 mojom::LocaleNotificationControllerRequest request) {
47 WmShell::Get()->locale_notification_controller()->BindRequest( 47 WmShell::Get()->locale_notification_controller()->BindRequest(
48 std::move(request)); 48 std::move(request));
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 main_thread_task_runner); 123 main_thread_task_runner);
124 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), 124 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread),
125 main_thread_task_runner); 125 main_thread_task_runner);
126 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), 126 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread),
127 main_thread_task_runner); 127 main_thread_task_runner);
128 } 128 }
129 129
130 } // namespace mojo_interface_factory 130 } // namespace mojo_interface_factory
131 131
132 } // namespace ash 132 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/accelerators/accelerator_router.cc ('k') | ash/common/shelf/app_list_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698