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

Side by Side Diff: chrome/browser/chromeos/chrome_interface_factory.cc

Issue 2235493002: mash: Disable ash_sysui; begin removal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. 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
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 "chrome/browser/chromeos/chrome_interface_factory.h" 5 #include "chrome/browser/chromeos/chrome_interface_factory.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/sysui/public/interfaces/wallpaper.mojom.h" 9 #include "ash/public/interfaces/wallpaper.mojom.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.h"
13 #include "base/threading/thread_task_runner_handle.h" 13 #include "base/threading/thread_task_runner_handle.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/ui/ash/app_list/app_list_presenter_service.h" 16 #include "chrome/browser/ui/ash/app_list/app_list_presenter_service.h"
17 #include "chrome/browser/ui/ash/chrome_wallpaper_manager.h" 17 #include "chrome/browser/ui/ash/chrome_wallpaper_manager.h"
18 #include "chrome/browser/ui/ash/keyboard_ui_service.h" 18 #include "chrome/browser/ui/ash/keyboard_ui_service.h"
19 #include "chrome/browser/ui/browser_commands.h" 19 #include "chrome/browser/ui/browser_commands.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 keyboard_bindings_.AddBinding(keyboard_ui_service_.get(), 106 keyboard_bindings_.AddBinding(keyboard_ui_service_.get(),
107 std::move(request)); 107 std::move(request));
108 } 108 }
109 109
110 void BindRequest(mash::mojom::LaunchableRequest request) { 110 void BindRequest(mash::mojom::LaunchableRequest request) {
111 if (!launchable_) 111 if (!launchable_)
112 launchable_.reset(new ChromeLaunchable); 112 launchable_.reset(new ChromeLaunchable);
113 launchable_->ProcessRequest(std::move(request)); 113 launchable_->ProcessRequest(std::move(request));
114 } 114 }
115 115
116 void BindRequest(ash::sysui::mojom::WallpaperManagerRequest request) { 116 void BindRequest(ash::mojom::WallpaperManagerRequest request) {
117 if (!wallpaper_manager_) 117 if (!wallpaper_manager_)
118 wallpaper_manager_.reset(new ChromeWallpaperManager); 118 wallpaper_manager_.reset(new ChromeWallpaperManager);
119 wallpaper_manager_->ProcessRequest(std::move(request)); 119 wallpaper_manager_->ProcessRequest(std::move(request));
120 } 120 }
121 121
122 void BindRequest(app_list::mojom::AppListPresenterRequest request) { 122 void BindRequest(app_list::mojom::AppListPresenterRequest request) {
123 if (!app_list_presenter_service_) 123 if (!app_list_presenter_service_)
124 app_list_presenter_service_.reset(new AppListPresenterService); 124 app_list_presenter_service_.reset(new AppListPresenterService);
125 app_list_presenter_bindings_.AddBinding(app_list_presenter_service_.get(), 125 app_list_presenter_bindings_.AddBinding(app_list_presenter_service_.get(),
126 std::move(request)); 126 std::move(request));
(...skipping 22 matching lines...) Expand all
149 149
150 ChromeInterfaceFactory::~ChromeInterfaceFactory() {} 150 ChromeInterfaceFactory::~ChromeInterfaceFactory() {}
151 151
152 bool ChromeInterfaceFactory::OnConnect(const shell::Identity& remote_identity, 152 bool ChromeInterfaceFactory::OnConnect(const shell::Identity& remote_identity,
153 shell::InterfaceRegistry* registry, 153 shell::InterfaceRegistry* registry,
154 shell::Connector* connector) { 154 shell::Connector* connector) {
155 FactoryImpl::AddFactory<keyboard::mojom::Keyboard>(registry, 155 FactoryImpl::AddFactory<keyboard::mojom::Keyboard>(registry,
156 main_thread_task_runner_); 156 main_thread_task_runner_);
157 FactoryImpl::AddFactory<mash::mojom::Launchable>(registry, 157 FactoryImpl::AddFactory<mash::mojom::Launchable>(registry,
158 main_thread_task_runner_); 158 main_thread_task_runner_);
159 FactoryImpl::AddFactory<ash::sysui::mojom::WallpaperManager>( 159 FactoryImpl::AddFactory<ash::mojom::WallpaperManager>(
160 registry, main_thread_task_runner_); 160 registry, main_thread_task_runner_);
161 FactoryImpl::AddFactory<app_list::mojom::AppListPresenter>( 161 FactoryImpl::AddFactory<app_list::mojom::AppListPresenter>(
162 registry, main_thread_task_runner_); 162 registry, main_thread_task_runner_);
163 return true; 163 return true;
164 } 164 }
165 165
166 } // namespace chromeos 166 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698