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 #include "base/macros.h" | 5 #include "base/macros.h" |
6 #include "content/public/browser/context_factory.h" | 6 #include "content/public/browser/context_factory.h" |
7 #include "content/shell/browser/shell_browser_context.h" | 7 #include "content/shell/browser/shell_browser_context.h" |
8 #include "ui/aura/test/test_screen.h" | 8 #include "ui/aura/test/test_screen.h" |
9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
10 #include "ui/gfx/screen.h" | 10 #include "ui/gfx/screen.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 const content::MainFunctionParams& content_params, | 23 const content::MainFunctionParams& content_params, |
24 ViewsContentClient* views_content_client); | 24 ViewsContentClient* views_content_client); |
25 ~ViewsContentClientMainPartsChromeOS() override {} | 25 ~ViewsContentClientMainPartsChromeOS() override {} |
26 | 26 |
27 // content::BrowserMainParts: | 27 // content::BrowserMainParts: |
28 void PreMainMessageLoopRun() override; | 28 void PreMainMessageLoopRun() override; |
29 void PostMainMessageLoopRun() override; | 29 void PostMainMessageLoopRun() override; |
30 | 30 |
31 private: | 31 private: |
32 // Enable a minimal set of views::corewm to be initialized. | 32 // Enable a minimal set of views::corewm to be initialized. |
33 scoped_ptr<gfx::Screen> test_screen_; | 33 std::unique_ptr<gfx::Screen> test_screen_; |
34 scoped_ptr< ::wm::WMTestHelper> wm_test_helper_; | 34 std::unique_ptr<::wm::WMTestHelper> wm_test_helper_; |
35 | 35 |
36 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsChromeOS); | 36 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsChromeOS); |
37 }; | 37 }; |
38 | 38 |
39 ViewsContentClientMainPartsChromeOS::ViewsContentClientMainPartsChromeOS( | 39 ViewsContentClientMainPartsChromeOS::ViewsContentClientMainPartsChromeOS( |
40 const content::MainFunctionParams& content_params, | 40 const content::MainFunctionParams& content_params, |
41 ViewsContentClient* views_content_client) | 41 ViewsContentClient* views_content_client) |
42 : ViewsContentClientMainPartsAura(content_params, views_content_client) { | 42 : ViewsContentClientMainPartsAura(content_params, views_content_client) { |
43 } | 43 } |
44 | 44 |
(...skipping 25 matching lines...) Expand all Loading... |
70 | 70 |
71 // static | 71 // static |
72 ViewsContentClientMainParts* ViewsContentClientMainParts::Create( | 72 ViewsContentClientMainParts* ViewsContentClientMainParts::Create( |
73 const content::MainFunctionParams& content_params, | 73 const content::MainFunctionParams& content_params, |
74 ViewsContentClient* views_content_client) { | 74 ViewsContentClient* views_content_client) { |
75 return new ViewsContentClientMainPartsChromeOS( | 75 return new ViewsContentClientMainPartsChromeOS( |
76 content_params, views_content_client); | 76 content_params, views_content_client); |
77 } | 77 } |
78 | 78 |
79 } // namespace ui | 79 } // namespace ui |
OLD | NEW |