| 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_SHELL_MAIN_DELEGATE_H_ | 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ |
| 6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ | 6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "content/shell/shell_content_client.h" | |
| 11 #include "content/public/app/content_main_delegate.h" | 10 #include "content/public/app/content_main_delegate.h" |
| 11 #include "content/shell/common/shell_content_client.h" |
| 12 | 12 |
| 13 namespace content { | 13 namespace content { |
| 14 class ShellContentRendererClient; | 14 class ShellContentRendererClient; |
| 15 class ShellContentPluginClient; | 15 class ShellContentPluginClient; |
| 16 class ShellContentUtilityClient; | 16 class ShellContentUtilityClient; |
| 17 } | 17 } |
| 18 | 18 |
| 19 namespace ash { | 19 namespace ash { |
| 20 namespace shell { | 20 namespace shell { |
| 21 | 21 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 36 scoped_ptr<ShellContentBrowserClient> browser_client_; | 36 scoped_ptr<ShellContentBrowserClient> browser_client_; |
| 37 content::ShellContentClient content_client_; | 37 content::ShellContentClient content_client_; |
| 38 | 38 |
| 39 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); | 39 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 } // namespace shell | 42 } // namespace shell |
| 43 } // namespace ash | 43 } // namespace ash |
| 44 | 44 |
| 45 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ | 45 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ |
| OLD | NEW |