| 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 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 private: | 68 private: |
| 69 void InitializeResources(service_manager::Connector* connector); | 69 void InitializeResources(service_manager::Connector* connector); |
| 70 | 70 |
| 71 #if defined(OS_LINUX) | 71 #if defined(OS_LINUX) |
| 72 sk_sp<font_service::FontLoader> font_loader_; | 72 sk_sp<font_service::FontLoader> font_loader_; |
| 73 #endif | 73 #endif |
| 74 | 74 |
| 75 const std::string resource_file_; | 75 const std::string resource_file_; |
| 76 const std::string resource_file_200_; | 76 const std::string resource_file_200_; |
| 77 | 77 |
| 78 std::unique_ptr<aura::Env> env_; |
| 78 std::unique_ptr<MusClient> mus_client_; | 79 std::unique_ptr<MusClient> mus_client_; |
| 79 std::unique_ptr<aura::Env> env_; | |
| 80 std::unique_ptr<ViewsDelegate> views_delegate_; | 80 std::unique_ptr<ViewsDelegate> views_delegate_; |
| 81 | 81 |
| 82 DISALLOW_COPY_AND_ASSIGN(AuraInit); | 82 DISALLOW_COPY_AND_ASSIGN(AuraInit); |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 } // namespace views | 85 } // namespace views |
| 86 | 86 |
| 87 #endif // UI_VIEWS_MUS_AURA_INIT_H_ | 87 #endif // UI_VIEWS_MUS_AURA_INIT_H_ |
| OLD | NEW |