| 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 CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ |
| 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ | 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "build/build_config.h" |
| 10 #include "content/shell/browser/shell_browser_main_parts.h" | 11 #include "content/shell/browser/shell_browser_main_parts.h" |
| 11 | 12 |
| 12 #if defined(OS_ANDROID) | 13 #if defined(OS_ANDROID) |
| 13 namespace breakpad { | 14 namespace breakpad { |
| 14 class CrashDumpManager; | 15 class CrashDumpManager; |
| 15 } | 16 } |
| 16 #endif | 17 #endif |
| 17 | 18 |
| 18 namespace base { | 19 namespace base { |
| 19 class Thread; | 20 class Thread; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 39 #if defined(ENABLE_PLUGINS) | 40 #if defined(ENABLE_PLUGINS) |
| 40 scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_; | 41 scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_; |
| 41 #endif | 42 #endif |
| 42 | 43 |
| 43 DISALLOW_COPY_AND_ASSIGN(LayoutTestBrowserMainParts); | 44 DISALLOW_COPY_AND_ASSIGN(LayoutTestBrowserMainParts); |
| 44 }; | 45 }; |
| 45 | 46 |
| 46 } // namespace content | 47 } // namespace content |
| 47 | 48 |
| 48 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ | 49 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ |
| OLD | NEW |