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

Side by Side Diff: mash/example/common/mus_views_init.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
OLDNEW
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_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ 5 #ifndef MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
6 #define MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ 6 #define MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_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 "components/mus/public/cpp/window_tree_delegate.h" 11 #include "components/mus/public/cpp/window_tree_delegate.h"
11 #include "components/mus/public/interfaces/window_manager.mojom.h" 12 #include "components/mus/public/interfaces/window_manager.mojom.h"
12 #include "ui/views/mus/aura_init.h" 13 #include "ui/views/mus/aura_init.h"
13 #include "ui/views/views_delegate.h" 14 #include "ui/views/views_delegate.h"
14 15
15 namespace mojo { 16 namespace mojo {
16 class ShellConnection; 17 class ShellConnection;
17 } 18 }
18 19
19 namespace views { 20 namespace views {
(...skipping 18 matching lines...) Expand all
38 views::internal::NativeWidgetDelegate* delegate) override; 39 views::internal::NativeWidgetDelegate* delegate) override;
39 40
40 // mus::WindowTreeDelegate: 41 // mus::WindowTreeDelegate:
41 void OnEmbed(mus::Window* root) override; 42 void OnEmbed(mus::Window* root) override;
42 void OnConnectionLost(mus::WindowTreeConnection* connection) override; 43 void OnConnectionLost(mus::WindowTreeConnection* connection) override;
43 #if defined(OS_WIN) 44 #if defined(OS_WIN)
44 HICON GetSmallWindowIcon() const override; 45 HICON GetSmallWindowIcon() const override;
45 #endif 46 #endif
46 47
47 mojo::ShellConnection* app_; 48 mojo::ShellConnection* app_;
48 scoped_ptr<views::AuraInit> aura_init_; 49 std::unique_ptr<views::AuraInit> aura_init_;
49 mus::mojom::WindowManagerPtr window_manager_; 50 mus::mojom::WindowManagerPtr window_manager_;
50 51
51 DISALLOW_COPY_AND_ASSIGN(MUSViewsInit); 52 DISALLOW_COPY_AND_ASSIGN(MUSViewsInit);
52 }; 53 };
53 54
54 #endif // MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ 55 #endif // MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698