| 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_SHELF_SHELF_APPLICATION_H_ | 5 #ifndef MASH_SHELF_SHELF_APPLICATION_H_ |
| 6 #define MASH_SHELF_SHELF_APPLICATION_H_ | 6 #define MASH_SHELF_SHELF_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/shell_client.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 shelf { | 18 namespace shelf { |
| 19 | 19 |
| 20 class ShelfApplication : public mojo::ApplicationDelegate { | 20 class ShelfApplication : public mojo::ShellClient { |
| 21 public: | 21 public: |
| 22 ShelfApplication(); | 22 ShelfApplication(); |
| 23 ~ShelfApplication() override; | 23 ~ShelfApplication() override; |
| 24 | 24 |
| 25 private: | 25 private: |
| 26 // mojo::ApplicationDelegate: | 26 // mojo::ShellClient: |
| 27 void Initialize(mojo::Shell* shell, const std::string& url, | 27 void Initialize(mojo::Shell* shell, const std::string& url, |
| 28 uint32_t id) override; | 28 uint32_t id) override; |
| 29 | 29 |
| 30 mojo::TracingImpl tracing_; | 30 mojo::TracingImpl tracing_; |
| 31 | 31 |
| 32 scoped_ptr<views::AuraInit> aura_init_; | 32 scoped_ptr<views::AuraInit> aura_init_; |
| 33 | 33 |
| 34 DISALLOW_COPY_AND_ASSIGN(ShelfApplication); | 34 DISALLOW_COPY_AND_ASSIGN(ShelfApplication); |
| 35 }; | 35 }; |
| 36 | 36 |
| 37 } // namespace shelf | 37 } // namespace shelf |
| 38 } // namespace mash | 38 } // namespace mash |
| 39 | 39 |
| 40 #endif // MASH_SHELF_SHELF_APPLICATION_H_ | 40 #endif // MASH_SHELF_SHELF_APPLICATION_H_ |
| OLD | NEW |