| 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 MASH_SYSTEM_UI_SYSTEM_UI_H_ | 5 #ifndef MASH_SYSTEM_UI_SYSTEM_UI_H_ |
| 6 #define MASH_SYSTEM_UI_SYSTEM_UI_H_ | 6 #define MASH_SYSTEM_UI_SYSTEM_UI_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "mojo/application/public/cpp/application_delegate.h" | |
| 11 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 10 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
| 11 #include "mojo/shell/public/cpp/application_delegate.h" |
| 12 | 12 |
| 13 namespace views { | 13 namespace views { |
| 14 class AuraInit; | 14 class AuraInit; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace mash { | 17 namespace mash { |
| 18 namespace system_ui { | 18 namespace system_ui { |
| 19 | 19 |
| 20 class SystemUI : public mojo::ApplicationDelegate { | 20 class SystemUI : public mojo::ApplicationDelegate { |
| 21 public: | 21 public: |
| (...skipping 10 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 scoped_ptr<views::AuraInit> aura_init_; | 33 scoped_ptr<views::AuraInit> aura_init_; |
| 34 | 34 |
| 35 DISALLOW_COPY_AND_ASSIGN(SystemUI); | 35 DISALLOW_COPY_AND_ASSIGN(SystemUI); |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 } // namespace system_ui | 38 } // namespace system_ui |
| 39 } // namespace mash | 39 } // namespace mash |
| 40 | 40 |
| 41 #endif // MASH_SYSTEM_UI_SYSTEM_UI_H_ | 41 #endif // MASH_SYSTEM_UI_SYSTEM_UI_H_ |
| OLD | NEW |