| 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 30 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 ~AuraInit(); | 42 ~AuraInit(); |
| 43 | 43 |
| 44 private: | 44 private: |
| 45 void InitializeResources(shell::Connector* connector); | 45 void InitializeResources(shell::Connector* connector); |
| 46 | 46 |
| 47 #if defined(OS_LINUX) | 47 #if defined(OS_LINUX) |
| 48 sk_sp<font_service::FontLoader> font_loader_; | 48 sk_sp<font_service::FontLoader> font_loader_; |
| 49 #endif | 49 #endif |
| 50 | 50 |
| 51 const std::string resource_file_; | 51 std::string resource_file_; |
| 52 const std::string resource_file_200_; | 52 std::string resource_file_200_; |
| 53 | 53 |
| 54 std::unique_ptr<aura::Env> env_; | 54 std::unique_ptr<aura::Env> env_; |
| 55 std::unique_ptr<ViewsDelegate> views_delegate_; | 55 std::unique_ptr<ViewsDelegate> views_delegate_; |
| 56 | 56 |
| 57 DISALLOW_COPY_AND_ASSIGN(AuraInit); | 57 DISALLOW_COPY_AND_ASSIGN(AuraInit); |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 } // namespace views | 60 } // namespace views |
| 61 | 61 |
| 62 #endif // UI_VIEWS_MUS_AURA_INIT_H_ | 62 #endif // UI_VIEWS_MUS_AURA_INIT_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2377203005:
services/shell: Allow injecting the location of resources.
