| 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_H_ | 5 #ifndef UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ |
| 6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ | 6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_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 "content/public/browser/browser_main_parts.h" | 11 #include "content/public/browser/browser_main_parts.h" |
| 11 | 12 |
| 12 namespace content { | 13 namespace content { |
| 13 class ShellBrowserContext; | 14 class ShellBrowserContext; |
| 14 struct MainFunctionParams; | 15 struct MainFunctionParams; |
| 15 } | 16 } |
| 16 | 17 |
| 17 namespace views { | 18 namespace views { |
| 18 class ViewsDelegate; | 19 class ViewsDelegate; |
| 19 } | 20 } |
| (...skipping 23 matching lines...) Expand all Loading... |
| 43 ViewsContentClient* views_content_client() { | 44 ViewsContentClient* views_content_client() { |
| 44 return views_content_client_; | 45 return views_content_client_; |
| 45 } | 46 } |
| 46 | 47 |
| 47 protected: | 48 protected: |
| 48 ViewsContentClientMainParts( | 49 ViewsContentClientMainParts( |
| 49 const content::MainFunctionParams& content_params, | 50 const content::MainFunctionParams& content_params, |
| 50 ViewsContentClient* views_content_client); | 51 ViewsContentClient* views_content_client); |
| 51 | 52 |
| 52 private: | 53 private: |
| 53 scoped_ptr<content::ShellBrowserContext> browser_context_; | 54 std::unique_ptr<content::ShellBrowserContext> browser_context_; |
| 54 | 55 |
| 55 scoped_ptr<views::ViewsDelegate> views_delegate_; | 56 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
| 56 | 57 |
| 57 ViewsContentClient* views_content_client_; | 58 ViewsContentClient* views_content_client_; |
| 58 | 59 |
| 59 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainParts); | 60 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainParts); |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 } // namespace ui | 63 } // namespace ui |
| 63 | 64 |
| 64 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ | 65 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ |
| OLD | NEW |