| 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 25 matching lines...) Expand all Loading... |
| 36 class ViewsDelegate; | 36 class ViewsDelegate; |
| 37 | 37 |
| 38 // Sets up necessary state for aura when run with the viewmanager. | 38 // Sets up necessary state for aura when run with the viewmanager. |
| 39 // |resource_file| is the path to the apk file containing the resources. | 39 // |resource_file| is the path to the apk file containing the resources. |
| 40 class VIEWS_MUS_EXPORT AuraInit { | 40 class VIEWS_MUS_EXPORT AuraInit { |
| 41 public: | 41 public: |
| 42 enum class Mode { | 42 enum class Mode { |
| 43 // Indicates AuraInit should target using aura with mus. | 43 // Indicates AuraInit should target using aura with mus. |
| 44 AURA_MUS, | 44 AURA_MUS, |
| 45 | 45 |
| 46 // Indicates AuraInit should target using aura with mus, for a Window |
| 47 // Manager client. |
| 48 AURA_MUS_WINDOW_MANAGER, |
| 49 |
| 46 // Indicates AuraInit should target using ui::Window. | 50 // Indicates AuraInit should target using ui::Window. |
| 47 UI, | 51 UI |
| 48 }; | 52 }; |
| 49 | 53 |
| 50 // |resource_file| is the file to load strings and 1x icons from. | 54 // |resource_file| is the file to load strings and 1x icons from. |
| 51 // |resource_file_200| can be an empty string, otherwise it is the file to | 55 // |resource_file_200| can be an empty string, otherwise it is the file to |
| 52 // load 2x icons from. | 56 // load 2x icons from. |
| 53 AuraInit(service_manager::Connector* connector, | 57 AuraInit(service_manager::Connector* connector, |
| 54 const service_manager::Identity& identity, | 58 const service_manager::Identity& identity, |
| 55 const std::string& resource_file, | 59 const std::string& resource_file, |
| 56 const std::string& resource_file_200 = std::string(), | 60 const std::string& resource_file_200 = std::string(), |
| 57 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr, | 61 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 74 std::unique_ptr<MusClient> mus_client_; | 78 std::unique_ptr<MusClient> mus_client_; |
| 75 std::unique_ptr<aura::Env> env_; | 79 std::unique_ptr<aura::Env> env_; |
| 76 std::unique_ptr<ViewsDelegate> views_delegate_; | 80 std::unique_ptr<ViewsDelegate> views_delegate_; |
| 77 | 81 |
| 78 DISALLOW_COPY_AND_ASSIGN(AuraInit); | 82 DISALLOW_COPY_AND_ASSIGN(AuraInit); |
| 79 }; | 83 }; |
| 80 | 84 |
| 81 } // namespace views | 85 } // namespace views |
| 82 | 86 |
| 83 #endif // UI_VIEWS_MUS_AURA_INIT_H_ | 87 #endif // UI_VIEWS_MUS_AURA_INIT_H_ |
| OLD | NEW |