| OLD | NEW |
| 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 #ifndef UI_VIEWS_MUS_AURA_INIT_H_ | 5 #ifndef UI_VIEWS_MUS_AURA_INIT_H_ |
| 6 #define UI_VIEWS_MUS_AURA_INIT_H_ | 6 #define UI_VIEWS_MUS_AURA_INIT_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | |
| 13 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 14 #include "skia/ext/refptr.h" | 13 #include "skia/ext/refptr.h" |
| 15 #include "ui/views/mus/mus_export.h" | 14 #include "ui/views/mus/mus_export.h" |
| 16 | 15 |
| 17 namespace aura { | 16 namespace aura { |
| 18 class Env; | 17 class Env; |
| 19 } | 18 } |
| 20 | 19 |
| 21 namespace font_service { | 20 namespace font_service { |
| 22 class FontLoader; | 21 class FontLoader; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 39 private: | 38 private: |
| 40 void InitializeResources(mojo::Connector* connector); | 39 void InitializeResources(mojo::Connector* connector); |
| 41 | 40 |
| 42 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 41 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
| 43 skia::RefPtr<font_service::FontLoader> font_loader_; | 42 skia::RefPtr<font_service::FontLoader> font_loader_; |
| 44 #endif | 43 #endif |
| 45 | 44 |
| 46 const std::string resource_file_; | 45 const std::string resource_file_; |
| 47 | 46 |
| 48 std::unique_ptr<aura::Env> env_; | 47 std::unique_ptr<aura::Env> env_; |
| 49 scoped_ptr<ViewsDelegate> views_delegate_; | 48 std::unique_ptr<ViewsDelegate> views_delegate_; |
| 50 | 49 |
| 51 DISALLOW_COPY_AND_ASSIGN(AuraInit); | 50 DISALLOW_COPY_AND_ASSIGN(AuraInit); |
| 52 }; | 51 }; |
| 53 | 52 |
| 54 } // namespace views | 53 } // namespace views |
| 55 | 54 |
| 56 #endif // UI_VIEWS_MUS_AURA_INIT_H_ | 55 #endif // UI_VIEWS_MUS_AURA_INIT_H_ |
| OLD | NEW |