OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_ | 5 #ifndef UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_ |
6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_ | 6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_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 "ui/views_content_client/views_content_client_main_parts.h" | 11 #include "ui/views_content_client/views_content_client_main_parts.h" |
11 | 12 |
12 namespace wm { | 13 namespace wm { |
13 class WMState; | 14 class WMState; |
14 } | 15 } |
15 | 16 |
16 namespace ui { | 17 namespace ui { |
17 | 18 |
18 class ViewsContentClientMainPartsAura : public ViewsContentClientMainParts { | 19 class ViewsContentClientMainPartsAura : public ViewsContentClientMainParts { |
19 protected: | 20 protected: |
20 ViewsContentClientMainPartsAura( | 21 ViewsContentClientMainPartsAura( |
21 const content::MainFunctionParams& content_params, | 22 const content::MainFunctionParams& content_params, |
22 ViewsContentClient* views_content_client); | 23 ViewsContentClient* views_content_client); |
23 ~ViewsContentClientMainPartsAura() override; | 24 ~ViewsContentClientMainPartsAura() override; |
24 | 25 |
25 // content::BrowserMainParts: | 26 // content::BrowserMainParts: |
26 void ToolkitInitialized() override; | 27 void ToolkitInitialized() override; |
27 void PostMainMessageLoopRun() override; | 28 void PostMainMessageLoopRun() override; |
28 | 29 |
29 private: | 30 private: |
30 scoped_ptr< ::wm::WMState> wm_state_; | 31 std::unique_ptr<::wm::WMState> wm_state_; |
31 | 32 |
32 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsAura); | 33 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsAura); |
33 }; | 34 }; |
34 | 35 |
35 } // namespace ui | 36 } // namespace ui |
36 | 37 |
37 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_ | 38 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_AURA_H_ |
OLD | NEW |