| 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 <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 13 #include "skia/ext/refptr.h" | 13 #include "skia/ext/refptr.h" |
| 14 #include "ui/views/mus/mus_export.h" | 14 #include "ui/views/mus/mus_export.h" |
| 15 | 15 |
| 16 namespace font_service { | 16 namespace font_service { |
| 17 class FontLoader; | 17 class FontLoader; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace mojo { | 20 namespace mojo { |
| 21 class Shell; | 21 class Connector; |
| 22 } | 22 } |
| 23 | 23 |
| 24 namespace views { | 24 namespace views { |
| 25 class ViewsDelegate; | 25 class ViewsDelegate; |
| 26 | 26 |
| 27 // Sets up necessary state for aura when run with the viewmanager. | 27 // Sets up necessary state for aura when run with the viewmanager. |
| 28 // |resource_file| is the path to the apk file containing the resources. | 28 // |resource_file| is the path to the apk file containing the resources. |
| 29 class VIEWS_MUS_EXPORT AuraInit { | 29 class VIEWS_MUS_EXPORT AuraInit { |
| 30 public: | 30 public: |
| 31 AuraInit(mojo::Shell* shell, const std::string& resource_file); | 31 AuraInit(mojo::Connector* connector, const std::string& resource_file); |
| 32 ~AuraInit(); | 32 ~AuraInit(); |
| 33 | 33 |
| 34 private: | 34 private: |
| 35 void InitializeResources(mojo::Shell* shell); | 35 void InitializeResources(mojo::Connector* connector); |
| 36 | 36 |
| 37 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 37 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
| 38 skia::RefPtr<font_service::FontLoader> font_loader_; | 38 skia::RefPtr<font_service::FontLoader> font_loader_; |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 const std::string resource_file_; | 41 const std::string resource_file_; |
| 42 | 42 |
| 43 scoped_ptr<ViewsDelegate> views_delegate_; | 43 scoped_ptr<ViewsDelegate> views_delegate_; |
| 44 | 44 |
| 45 DISALLOW_COPY_AND_ASSIGN(AuraInit); | 45 DISALLOW_COPY_AND_ASSIGN(AuraInit); |
| 46 }; | 46 }; |
| 47 | 47 |
| 48 } // namespace views | 48 } // namespace views |
| 49 | 49 |
| 50 #endif // UI_VIEWS_MUS_AURA_INIT_H_ | 50 #endif // UI_VIEWS_MUS_AURA_INIT_H_ |
| OLD | NEW |