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

Unified Diff: services/service_manager/embedder/main.cc

Issue 2845523003: Removes duplicate ui::RegisterPathProvider() (Closed)
Patch Set: Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/app/content_main_runner.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/service_manager/embedder/main.cc
diff --git a/services/service_manager/embedder/main.cc b/services/service_manager/embedder/main.cc
index 86a6a62f62018f767bbd02a92d1dc35a1aad7062..24b9d66b00c7cda703bc60fa5f58b0d8e5dcb822 100644
--- a/services/service_manager/embedder/main.cc
+++ b/services/service_manager/embedder/main.cc
@@ -266,7 +266,6 @@ int RunServiceManager(MainDelegate* delegate) {
}
void InitializeResources() {
- ui::RegisterPathProvider();
const std::string locale =
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
::switches::kLang);
@@ -392,6 +391,8 @@ int Main(const MainParams& params) {
mojo::edk::SetMaxMessageSize(kMaximumMojoMessageSize);
mojo::edk::Init();
+ ui::RegisterPathProvider();
+
base::debug::GlobalActivityTracker* tracker =
base::debug::GlobalActivityTracker::Get();
int exit_code = delegate->Initialize(init_params);
« no previous file with comments | « content/app/content_main_runner.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698