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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase 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/views/mus/DEPS ('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"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "services/catalog/public/cpp/resource_loader.h" 13 #include "services/catalog/public/cpp/resource_loader.h"
14 #include "services/shell/public/cpp/connector.h" 14 #include "services/service_manager/public/cpp/connector.h"
15 #include "ui/aura/env.h" 15 #include "ui/aura/env.h"
16 #include "ui/base/ime/input_method_initializer.h" 16 #include "ui/base/ime/input_method_initializer.h"
17 #include "ui/base/material_design/material_design_controller.h" 17 #include "ui/base/material_design/material_design_controller.h"
18 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
19 #include "ui/base/ui_base_paths.h" 19 #include "ui/base/ui_base_paths.h"
20 #include "ui/views/views_delegate.h" 20 #include "ui/views/views_delegate.h"
21 21
22 #if defined(OS_LINUX) 22 #if defined(OS_LINUX)
23 #include "components/font_service/public/cpp/font_loader.h" 23 #include "components/font_service/public/cpp/font_loader.h"
24 #endif 24 #endif
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/views/mus/DEPS ('k') | ui/views/mus/clipboard_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698