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

Side by Side Diff: ui/views/mus/aura_init.cc

Issue 2390013002: Rename mojo: to service: (Closed)
Patch Set: . 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 | « ui/ozone/platform/drm/cursor_proxy_mojo.cc ('k') | ui/views/mus/clipboard_mus.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ui/views/mus/aura_init.h" 5 #include "ui/views/mus/aura_init.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // used to launch the current app). 85 // used to launch the current app).
86 if (ui::ResourceBundle::HasSharedInstance()) 86 if (ui::ResourceBundle::HasSharedInstance())
87 return; 87 return;
88 88
89 std::set<std::string> resource_paths({resource_file_}); 89 std::set<std::string> resource_paths({resource_file_});
90 if (!resource_file_200_.empty()) 90 if (!resource_file_200_.empty())
91 resource_paths.insert(resource_file_200_); 91 resource_paths.insert(resource_file_200_);
92 92
93 catalog::ResourceLoader loader; 93 catalog::ResourceLoader loader;
94 filesystem::mojom::DirectoryPtr directory; 94 filesystem::mojom::DirectoryPtr directory;
95 connector->ConnectToInterface("mojo:catalog", &directory); 95 connector->ConnectToInterface("service:catalog", &directory);
96 CHECK(loader.OpenFiles(std::move(directory), resource_paths)); 96 CHECK(loader.OpenFiles(std::move(directory), resource_paths));
97 ui::RegisterPathProvider(); 97 ui::RegisterPathProvider();
98 base::File pak_file = loader.TakeFile(resource_file_); 98 base::File pak_file = loader.TakeFile(resource_file_);
99 base::File pak_file_2 = pak_file.Duplicate(); 99 base::File pak_file_2 = pak_file.Duplicate();
100 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( 100 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
101 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile); 101 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile);
102 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( 102 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
103 std::move(pak_file_2), ui::SCALE_FACTOR_100P); 103 std::move(pak_file_2), ui::SCALE_FACTOR_100P);
104 if (!resource_file_200_.empty()) 104 if (!resource_file_200_.empty())
105 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( 105 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
106 loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P); 106 loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P);
107 } 107 }
108 108
109 } // namespace views 109 } // namespace views
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/cursor_proxy_mojo.cc ('k') | ui/views/mus/clipboard_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698