| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_SHELF_SHELF_APPLICATION_H_ | 5 #ifndef ASH_MUS_SYSUI_SYSUI_APPLICATION_H_ |
| 6 #define MASH_SHELF_SHELF_APPLICATION_H_ | 6 #define ASH_MUS_SYSUI_SYSUI_APPLICATION_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/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" | 11 #include "mojo/shell/public/cpp/application_delegate.h" |
| 12 | 12 |
| 13 namespace views { | 13 namespace ash { |
| 14 class AuraInit; | 14 namespace sysui { |
| 15 } | |
| 16 | 15 |
| 17 namespace mash { | 16 class AshInit; |
| 18 namespace shelf { | |
| 19 | 17 |
| 20 class ShelfApplication : public mojo::ApplicationDelegate { | 18 class SysUIApplication : public mojo::ApplicationDelegate { |
| 21 public: | 19 public: |
| 22 ShelfApplication(); | 20 SysUIApplication(); |
| 23 ~ShelfApplication() override; | 21 ~SysUIApplication() override; |
| 24 | 22 |
| 25 private: | 23 private: |
| 26 // mojo::ApplicationDelegate: | 24 // mojo::ApplicationDelegate: |
| 27 void Initialize(mojo::ApplicationImpl* app) override; | 25 void Initialize(mojo::ApplicationImpl* app) override; |
| 28 bool ConfigureIncomingConnection( | 26 bool ConfigureIncomingConnection( |
| 29 mojo::ApplicationConnection* connection) override; | 27 mojo::ApplicationConnection* connection) override; |
| 30 | 28 |
| 31 mojo::TracingImpl tracing_; | 29 mojo::TracingImpl tracing_; |
| 30 scoped_ptr<AshInit> ash_init_; |
| 32 | 31 |
| 33 scoped_ptr<views::AuraInit> aura_init_; | 32 DISALLOW_COPY_AND_ASSIGN(SysUIApplication); |
| 34 | |
| 35 DISALLOW_COPY_AND_ASSIGN(ShelfApplication); | |
| 36 }; | 33 }; |
| 37 | 34 |
| 38 } // namespace shelf | 35 } // namespace sysui |
| 39 } // namespace mash | 36 } // namespace ash |
| 40 | 37 |
| 41 #endif // MASH_SHELF_SHELF_APPLICATION_H_ | 38 #endif // ASH_MUS_SYSUI_SYSUI_APPLICATION_H_ |
| OLD | NEW |