OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "services/ui/service.h" | 5 #include "services/ui/service.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 if (ui::ResourceBundle::HasSharedInstance()) | 97 if (ui::ResourceBundle::HasSharedInstance()) |
98 return; | 98 return; |
99 | 99 |
100 std::set<std::string> resource_paths; | 100 std::set<std::string> resource_paths; |
101 resource_paths.insert(kResourceFileStrings); | 101 resource_paths.insert(kResourceFileStrings); |
102 resource_paths.insert(kResourceFile100); | 102 resource_paths.insert(kResourceFile100); |
103 resource_paths.insert(kResourceFile200); | 103 resource_paths.insert(kResourceFile200); |
104 | 104 |
105 catalog::ResourceLoader loader; | 105 catalog::ResourceLoader loader; |
106 filesystem::mojom::DirectoryPtr directory; | 106 filesystem::mojom::DirectoryPtr directory; |
107 connector->ConnectToInterface("mojo:catalog", &directory); | 107 connector->ConnectToInterface("service:catalog", &directory); |
108 CHECK(loader.OpenFiles(std::move(directory), resource_paths)); | 108 CHECK(loader.OpenFiles(std::move(directory), resource_paths)); |
109 | 109 |
110 ui::RegisterPathProvider(); | 110 ui::RegisterPathProvider(); |
111 | 111 |
112 // Initialize resource bundle with 1x and 2x cursor bitmaps. | 112 // Initialize resource bundle with 1x and 2x cursor bitmaps. |
113 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( | 113 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( |
114 loader.TakeFile(kResourceFileStrings), | 114 loader.TakeFile(kResourceFileStrings), |
115 base::MemoryMappedFile::Region::kWholeFile); | 115 base::MemoryMappedFile::Region::kWholeFile); |
116 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 116 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
117 rb.AddDataPackFromFile(loader.TakeFile(kResourceFile100), | 117 rb.AddDataPackFromFile(loader.TakeFile(kResourceFile100), |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 mojom::WindowServerTestRequest request) { | 359 mojom::WindowServerTestRequest request) { |
360 if (!test_config_) | 360 if (!test_config_) |
361 return; | 361 return; |
362 mojo::MakeStrongBinding( | 362 mojo::MakeStrongBinding( |
363 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), | 363 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), |
364 std::move(request)); | 364 std::move(request)); |
365 } | 365 } |
366 | 366 |
367 | 367 |
368 } // namespace ui | 368 } // namespace ui |
OLD | NEW |