OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
6 #define CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ | 6 #define CONTENT_SHELL_BROWSER_SHELL_BROWSER_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 "build/build_config.h" | 11 #include "build/build_config.h" |
11 #include "content/public/browser/browser_main_parts.h" | 12 #include "content/public/browser/browser_main_parts.h" |
12 #include "content/public/common/main_function_params.h" | 13 #include "content/public/common/main_function_params.h" |
13 #include "content/shell/browser/shell_browser_context.h" | 14 #include "content/shell/browser/shell_browser_context.h" |
14 | 15 |
15 #if defined(OS_ANDROID) | 16 #if defined(OS_ANDROID) |
16 namespace breakpad { | 17 namespace breakpad { |
17 class CrashDumpManager; | 18 class CrashDumpManager; |
18 } | 19 } |
19 #endif | 20 #endif |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 | 67 |
67 void set_browser_context(ShellBrowserContext* context) { | 68 void set_browser_context(ShellBrowserContext* context) { |
68 browser_context_.reset(context); | 69 browser_context_.reset(context); |
69 } | 70 } |
70 void set_off_the_record_browser_context(ShellBrowserContext* context) { | 71 void set_off_the_record_browser_context(ShellBrowserContext* context) { |
71 off_the_record_browser_context_.reset(context); | 72 off_the_record_browser_context_.reset(context); |
72 } | 73 } |
73 | 74 |
74 private: | 75 private: |
75 #if defined(OS_ANDROID) | 76 #if defined(OS_ANDROID) |
76 scoped_ptr<breakpad::CrashDumpManager> crash_dump_manager_; | 77 std::unique_ptr<breakpad::CrashDumpManager> crash_dump_manager_; |
77 #endif | 78 #endif |
78 scoped_ptr<net::NetLog> net_log_; | 79 std::unique_ptr<net::NetLog> net_log_; |
79 scoped_ptr<ShellBrowserContext> browser_context_; | 80 std::unique_ptr<ShellBrowserContext> browser_context_; |
80 scoped_ptr<ShellBrowserContext> off_the_record_browser_context_; | 81 std::unique_ptr<ShellBrowserContext> off_the_record_browser_context_; |
81 | 82 |
82 // For running content_browsertests. | 83 // For running content_browsertests. |
83 const MainFunctionParams parameters_; | 84 const MainFunctionParams parameters_; |
84 bool run_message_loop_; | 85 bool run_message_loop_; |
85 | 86 |
86 scoped_ptr<devtools_http_handler::DevToolsHttpHandler> devtools_http_handler_; | 87 std::unique_ptr<devtools_http_handler::DevToolsHttpHandler> |
| 88 devtools_http_handler_; |
87 | 89 |
88 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); | 90 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); |
89 }; | 91 }; |
90 | 92 |
91 } // namespace content | 93 } // namespace content |
92 | 94 |
93 #endif // CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ | 95 #endif // CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
OLD | NEW |