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

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

Issue 1402213002: Moves mandoline/ui/aura to ui/views/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable presubmit Created 5 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/aura_init.h ('k') | ui/views/mus/input_method_mus.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 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 "mandoline/ui/aura/aura_init.h" 5 #include "ui/views/mus/aura_init.h"
6 6
7 #include "base/i18n/icu_util.h" 7 #include "base/i18n/icu_util.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "components/mus/public/cpp/view.h" 10 #include "components/mus/public/cpp/view.h"
11 #include "components/resource_provider/public/cpp/resource_loader.h" 11 #include "components/resource_provider/public/cpp/resource_loader.h"
12 #include "mojo/converters/geometry/geometry_type_converters.h" 12 #include "mojo/converters/geometry/geometry_type_converters.h"
13 #include "ui/aura/env.h" 13 #include "ui/aura/env.h"
14 #include "ui/base/ime/input_method_initializer.h" 14 #include "ui/base/ime/input_method_initializer.h"
15 #include "ui/base/resource/resource_bundle.h" 15 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/base/ui_base_paths.h" 16 #include "ui/base/ui_base_paths.h"
17 17
18 #if defined(OS_LINUX) && !defined(OS_ANDROID) 18 #if defined(OS_LINUX) && !defined(OS_ANDROID)
19 #include "components/font_service/public/cpp/font_loader.h" 19 #include "components/font_service/public/cpp/font_loader.h"
20 #endif 20 #endif
21 21
22 namespace mandoline { 22 namespace views {
23 23
24 namespace { 24 namespace {
25 25
26 std::set<std::string> GetResourcePaths(const std::string& resource_file) { 26 std::set<std::string> GetResourcePaths(const std::string& resource_file) {
27 std::set<std::string> paths; 27 std::set<std::string> paths;
28 paths.insert(resource_file); 28 paths.insert(resource_file);
29 return paths; 29 return paths;
30 } 30 }
31 31
32 } // namespace 32 } // namespace
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 resource_loader.GetICUFile().TakePlatformFile(), 70 resource_loader.GetICUFile().TakePlatformFile(),
71 base::MemoryMappedFile::Region::kWholeFile); 71 base::MemoryMappedFile::Region::kWholeFile);
72 ui::RegisterPathProvider(); 72 ui::RegisterPathProvider();
73 base::File pak_file = resource_loader.ReleaseFile(resource_file_); 73 base::File pak_file = resource_loader.ReleaseFile(resource_file_);
74 base::File pak_file_2 = pak_file.Duplicate(); 74 base::File pak_file_2 = pak_file.Duplicate();
75 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( 75 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
76 pak_file.Pass(), base::MemoryMappedFile::Region::kWholeFile); 76 pak_file.Pass(), base::MemoryMappedFile::Region::kWholeFile);
77 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( 77 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
78 pak_file_2.Pass(), ui::SCALE_FACTOR_100P); 78 pak_file_2.Pass(), ui::SCALE_FACTOR_100P);
79 79
80 // Initialize the skia font code to go ask fontconfig underneath. 80 // Initialize the skia font code to go ask fontconfig underneath.
81 #if defined(OS_LINUX) && !defined(OS_ANDROID) 81 #if defined(OS_LINUX) && !defined(OS_ANDROID)
82 font_loader_ = skia::AdoptRef(new font_service::FontLoader(shell)); 82 font_loader_ = skia::AdoptRef(new font_service::FontLoader(shell));
83 SkFontConfigInterface::SetGlobal(font_loader_.get()); 83 SkFontConfigInterface::SetGlobal(font_loader_.get());
84 #endif 84 #endif
85 85
86 // There is a bunch of static state in gfx::Font, by running this now, 86 // There is a bunch of static state in gfx::Font, by running this now,
87 // before any other apps load, we ensure all the state is set up. 87 // before any other apps load, we ensure all the state is set up.
88 gfx::Font(); 88 gfx::Font();
89 } 89 }
90 90
91 } // namespace mandoline 91 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/aura_init.h ('k') | ui/views/mus/input_method_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698