| 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 "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "content/public/browser/browser_main_parts.h" | 10 #include "content/public/browser/browser_main_parts.h" |
| 11 | 11 |
| 12 namespace base { | 12 namespace base { |
| 13 class Thread; | 13 class Thread; |
| 14 } | 14 } |
| 15 | 15 |
| 16 namespace content { | 16 namespace content { |
| 17 class ShellBrowserContext; | 17 class ShellBrowserContext; |
| 18 struct MainFunctionParams; | 18 struct MainFunctionParams; |
| 19 } | 19 } |
| 20 | 20 |
| 21 namespace net { | 21 namespace net { |
| 22 class NetLog; | 22 class NetLog; |
| 23 } | 23 } |
| 24 | 24 |
| 25 namespace views { | 25 namespace wm { |
| 26 namespace corewm { | |
| 27 class WMState; | 26 class WMState; |
| 28 } | 27 } |
| 29 } | |
| 30 | 28 |
| 31 namespace ash { | 29 namespace ash { |
| 32 namespace shell { | 30 namespace shell { |
| 33 | 31 |
| 34 class ShellDelegateImpl; | 32 class ShellDelegateImpl; |
| 35 class WindowWatcher; | 33 class WindowWatcher; |
| 36 | 34 |
| 37 class ShellBrowserMainParts : public content::BrowserMainParts { | 35 class ShellBrowserMainParts : public content::BrowserMainParts { |
| 38 public: | 36 public: |
| 39 explicit ShellBrowserMainParts( | 37 explicit ShellBrowserMainParts( |
| (...skipping 10 matching lines...) Expand all Loading... |
| 50 | 48 |
| 51 content::ShellBrowserContext* browser_context() { | 49 content::ShellBrowserContext* browser_context() { |
| 52 return browser_context_.get(); | 50 return browser_context_.get(); |
| 53 } | 51 } |
| 54 | 52 |
| 55 private: | 53 private: |
| 56 scoped_ptr<net::NetLog> net_log_; | 54 scoped_ptr<net::NetLog> net_log_; |
| 57 scoped_ptr<content::ShellBrowserContext> browser_context_; | 55 scoped_ptr<content::ShellBrowserContext> browser_context_; |
| 58 scoped_ptr<ash::shell::WindowWatcher> window_watcher_; | 56 scoped_ptr<ash::shell::WindowWatcher> window_watcher_; |
| 59 ShellDelegateImpl* delegate_; // owned by Shell | 57 ShellDelegateImpl* delegate_; // owned by Shell |
| 60 scoped_ptr<views::corewm::WMState> wm_state_; | 58 scoped_ptr<wm::WMState> wm_state_; |
| 61 | 59 |
| 62 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); | 60 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); |
| 63 }; | 61 }; |
| 64 | 62 |
| 65 } // namespace shell | 63 } // namespace shell |
| 66 } // namespace ash | 64 } // namespace ash |
| 67 | 65 |
| 68 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ | 66 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
| OLD | NEW |