Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Side by Side Diff: mash/quick_launch/quick_launch_application.h

Issue 1857623003: convert //mash to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mash/login/login.cc ('k') | mash/quick_launch/quick_launch_application.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h" 11 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
11 #include "mojo/services/tracing/public/cpp/tracing_impl.h" 12 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
12 #include "mojo/shell/public/cpp/shell_client.h" 13 #include "mojo/shell/public/cpp/shell_client.h"
13 14
14 namespace views { 15 namespace views {
15 class AuraInit; 16 class AuraInit;
16 } 17 }
17 18
18 namespace mash { 19 namespace mash {
19 namespace quick_launch { 20 namespace quick_launch {
20 21
21 class QuickLaunchApplication : public mojo::ShellClient { 22 class QuickLaunchApplication : public mojo::ShellClient {
22 public: 23 public:
23 QuickLaunchApplication(); 24 QuickLaunchApplication();
24 ~QuickLaunchApplication() override; 25 ~QuickLaunchApplication() override;
25 26
26 private: 27 private:
27 // mojo::ShellClient: 28 // mojo::ShellClient:
28 void Initialize(mojo::Connector* connector, 29 void Initialize(mojo::Connector* connector,
29 const mojo::Identity& identity, 30 const mojo::Identity& identity,
30 uint32_t id) override; 31 uint32_t id) override;
31 32
32 mojo::TracingImpl tracing_; 33 mojo::TracingImpl tracing_;
33 scoped_ptr<views::AuraInit> aura_init_; 34 std::unique_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_
OLDNEW
« no previous file with comments | « mash/login/login.cc ('k') | mash/quick_launch/quick_launch_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698