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

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

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
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/path_service.h" 11 #include "base/path_service.h"
12 #include "build/build_config.h"
11 #include "components/resource_provider/public/cpp/resource_loader.h" 13 #include "components/resource_provider/public/cpp/resource_loader.h"
12 #include "mojo/application/public/cpp/application_impl.h" 14 #include "mojo/application/public/cpp/application_impl.h"
13 #include "ui/aura/env.h" 15 #include "ui/aura/env.h"
14 #include "ui/base/ime/input_method_initializer.h" 16 #include "ui/base/ime/input_method_initializer.h"
15 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/base/ui_base_paths.h" 18 #include "ui/base/ui_base_paths.h"
17 #include "ui/views/views_delegate.h" 19 #include "ui/views/views_delegate.h"
18 20
19 #if defined(OS_LINUX) && !defined(OS_ANDROID) 21 #if defined(OS_LINUX) && !defined(OS_ANDROID)
20 #include "components/font_service/public/cpp/font_loader.h" 22 #include "components/font_service/public/cpp/font_loader.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 font_loader_ = skia::AdoptRef(new font_service::FontLoader(app->shell())); 93 font_loader_ = skia::AdoptRef(new font_service::FontLoader(app->shell()));
92 SkFontConfigInterface::SetGlobal(font_loader_.get()); 94 SkFontConfigInterface::SetGlobal(font_loader_.get());
93 #endif 95 #endif
94 96
95 // There is a bunch of static state in gfx::Font, by running this now, 97 // There is a bunch of static state in gfx::Font, by running this now,
96 // before any other apps load, we ensure all the state is set up. 98 // before any other apps load, we ensure all the state is set up.
97 gfx::Font(); 99 gfx::Font();
98 } 100 }
99 101
100 } // namespace views 102 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698