OLD | NEW |
1 // Copyright 2016 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_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ | 5 #ifndef MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ |
6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ | 6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_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/shell_client.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 quick_launch { | 18 namespace quick_launch { |
19 | 19 |
20 class QuickLaunchApplication : public mojo::ShellClient { | 20 class QuickLaunchApplication : public mojo::ShellClient { |
21 public: | 21 public: |
22 QuickLaunchApplication(); | 22 QuickLaunchApplication(); |
23 ~QuickLaunchApplication() override; | 23 ~QuickLaunchApplication() override; |
24 | 24 |
25 private: | 25 private: |
26 // mojo::ShellClient: | 26 // mojo::ShellClient: |
27 void Initialize(mojo::Shell* shell, | 27 void Initialize(mojo::Shell* shell, |
28 const std::string& url, | 28 const std::string& url, |
29 uint32_t id) override; | 29 uint32_t id, |
| 30 uint32_t user_id) override; |
30 bool AcceptConnection(mojo::Connection* connection) override; | 31 bool AcceptConnection(mojo::Connection* connection) override; |
31 | 32 |
32 mojo::TracingImpl tracing_; | 33 mojo::TracingImpl tracing_; |
33 scoped_ptr<views::AuraInit> aura_init_; | 34 scoped_ptr<views::AuraInit> aura_init_; |
34 | 35 |
35 DISALLOW_COPY_AND_ASSIGN(QuickLaunchApplication); | 36 DISALLOW_COPY_AND_ASSIGN(QuickLaunchApplication); |
36 }; | 37 }; |
37 | 38 |
38 } // namespace quick_launch | 39 } // namespace quick_launch |
39 } // namespace mash | 40 } // namespace mash |
40 | 41 |
41 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ | 42 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ |
OLD | NEW |