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

Side by Side Diff: chrome/app/mash/mash_runner.cc

Issue 1942473002: Eliminate mojo:resource_provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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 | « chrome/app/mash/DEPS ('k') | components/filesystem/directory_impl.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 "chrome/app/mash/mash_runner.h" 5 #include "chrome/app/mash/mash_runner.h"
6 6
7 #include "ash/mus/sysui_application.h" 7 #include "ash/mus/sysui_application.h"
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/debug/debugger.h" 11 #include "base/debug/debugger.h"
12 #include "base/i18n/icu_util.h" 12 #include "base/i18n/icu_util.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/process/launch.h" 16 #include "base/process/launch.h"
17 #include "components/mus/mus_app.h" 17 #include "components/mus/mus_app.h"
18 #include "components/resource_provider/resource_provider_app.h"
19 #include "content/public/common/content_switches.h" 18 #include "content/public/common/content_switches.h"
20 #include "mash/browser_driver/browser_driver_application_delegate.h" 19 #include "mash/browser_driver/browser_driver_application_delegate.h"
21 #include "mash/quick_launch/quick_launch_application.h" 20 #include "mash/quick_launch/quick_launch_application.h"
22 #include "mash/session/session.h" 21 #include "mash/session/session.h"
23 #include "mash/task_viewer/task_viewer.h" 22 #include "mash/task_viewer/task_viewer.h"
24 #include "mash/wm/window_manager_application.h" 23 #include "mash/wm/window_manager_application.h"
25 #include "mojo/public/cpp/bindings/binding_set.h" 24 #include "mojo/public/cpp/bindings/binding_set.h"
26 #include "services/shell/background/background_shell.h" 25 #include "services/shell/background/background_shell.h"
27 #include "services/shell/native_runner_delegate.h" 26 #include "services/shell/native_runner_delegate.h"
28 #include "services/shell/public/cpp/connector.h" 27 #include "services/shell/public/cpp/connector.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 if (name == "mojo:ash_sysui") 87 if (name == "mojo:ash_sysui")
89 return base::WrapUnique(new ash::sysui::SysUIApplication); 88 return base::WrapUnique(new ash::sysui::SysUIApplication);
90 if (name == "mojo:desktop_wm") 89 if (name == "mojo:desktop_wm")
91 return base::WrapUnique(new mash::wm::WindowManagerApplication); 90 return base::WrapUnique(new mash::wm::WindowManagerApplication);
92 if (name == "mojo:mash_session") 91 if (name == "mojo:mash_session")
93 return base::WrapUnique(new mash::session::Session); 92 return base::WrapUnique(new mash::session::Session);
94 if (name == "mojo:mus") 93 if (name == "mojo:mus")
95 return base::WrapUnique(new mus::MandolineUIServicesApp); 94 return base::WrapUnique(new mus::MandolineUIServicesApp);
96 if (name == "mojo:quick_launch") 95 if (name == "mojo:quick_launch")
97 return base::WrapUnique(new mash::quick_launch::QuickLaunchApplication); 96 return base::WrapUnique(new mash::quick_launch::QuickLaunchApplication);
98 if (name == "mojo:resource_provider") {
99 return base::WrapUnique(
100 new resource_provider::ResourceProviderApp("mojo:resource_provider"));
101 }
102 if (name == "mojo:task_viewer") 97 if (name == "mojo:task_viewer")
103 return base::WrapUnique(new mash::task_viewer::TaskViewer); 98 return base::WrapUnique(new mash::task_viewer::TaskViewer);
104 #if defined(OS_LINUX) 99 #if defined(OS_LINUX)
105 if (name == "mojo:font_service") 100 if (name == "mojo:font_service")
106 return base::WrapUnique(new font_service::FontServiceApp); 101 return base::WrapUnique(new font_service::FontServiceApp);
107 #endif 102 #endif
108 if (name == "mojo:browser_driver") { 103 if (name == "mojo:browser_driver") {
109 return base::WrapUnique( 104 return base::WrapUnique(
110 new mash::browser_driver::BrowserDriverApplicationDelegate()); 105 new mash::browser_driver::BrowserDriverApplicationDelegate());
111 } 106 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 std::unique_ptr<base::MessageLoop> message_loop; 229 std::unique_ptr<base::MessageLoop> message_loop;
235 #if defined(OS_LINUX) 230 #if defined(OS_LINUX)
236 base::AtExitManager exit_manager; 231 base::AtExitManager exit_manager;
237 #endif 232 #endif
238 if (!IsChild()) 233 if (!IsChild())
239 message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI)); 234 message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
240 MashRunner mash_runner; 235 MashRunner mash_runner;
241 mash_runner.Run(); 236 mash_runner.Run();
242 return 0; 237 return 0;
243 } 238 }
OLDNEW
« no previous file with comments | « chrome/app/mash/DEPS ('k') | components/filesystem/directory_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698