| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ | 5 #ifndef ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
| 6 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ | 6 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_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 "content/public/browser/browser_main_parts.h" | 11 #include "content/public/browser/browser_main_parts.h" |
| 11 | 12 |
| 12 namespace base { | 13 namespace base { |
| 13 class Thread; | 14 class Thread; |
| 14 } | 15 } |
| 15 | 16 |
| 16 namespace content { | 17 namespace content { |
| 17 class ShellBrowserContext; | 18 class ShellBrowserContext; |
| 18 struct MainFunctionParams; | 19 struct MainFunctionParams; |
| 19 } | 20 } |
| (...skipping 27 matching lines...) Expand all Loading... |
| 47 void ToolkitInitialized() override; | 48 void ToolkitInitialized() override; |
| 48 void PreMainMessageLoopRun() override; | 49 void PreMainMessageLoopRun() override; |
| 49 bool MainMessageLoopRun(int* result_code) override; | 50 bool MainMessageLoopRun(int* result_code) override; |
| 50 void PostMainMessageLoopRun() override; | 51 void PostMainMessageLoopRun() override; |
| 51 | 52 |
| 52 content::ShellBrowserContext* browser_context() { | 53 content::ShellBrowserContext* browser_context() { |
| 53 return browser_context_.get(); | 54 return browser_context_.get(); |
| 54 } | 55 } |
| 55 | 56 |
| 56 private: | 57 private: |
| 57 scoped_ptr<net::NetLog> net_log_; | 58 std::unique_ptr<net::NetLog> net_log_; |
| 58 scoped_ptr<content::ShellBrowserContext> browser_context_; | 59 std::unique_ptr<content::ShellBrowserContext> browser_context_; |
| 59 scoped_ptr<views::ViewsDelegate> views_delegate_; | 60 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
| 60 scoped_ptr<ash::shell::WindowWatcher> window_watcher_; | 61 std::unique_ptr<ash::shell::WindowWatcher> window_watcher_; |
| 61 ShellDelegateImpl* delegate_; // owned by Shell | 62 ShellDelegateImpl* delegate_; // owned by Shell |
| 62 scoped_ptr<wm::WMState> wm_state_; | 63 std::unique_ptr<wm::WMState> wm_state_; |
| 63 | 64 |
| 64 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); | 65 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); |
| 65 }; | 66 }; |
| 66 | 67 |
| 67 } // namespace shell | 68 } // namespace shell |
| 68 } // namespace ash | 69 } // namespace ash |
| 69 | 70 |
| 70 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ | 71 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
| OLD | NEW |