| 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 #include "content/shell/renderer/shell_render_process_observer.h" | 5 #include "content/shell/renderer/shell_render_process_observer.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "content/public/common/content_client.h" | 8 #include "content/public/common/content_client.h" |
| 9 #include "content/public/renderer/render_thread.h" | 9 #include "content/public/renderer/render_thread.h" |
| 10 #include "content/public/renderer/render_view.h" | 10 #include "content/public/renderer/render_view.h" |
| 11 #include "content/public/test/layouttest_support.h" | 11 #include "content/public/test/layouttest_support.h" |
| 12 #include "content/shell/common/shell_messages.h" | 12 #include "content/shell/common/shell_messages.h" |
| 13 #include "content/shell/common/shell_switches.h" | 13 #include "content/shell/common/shell_switches.h" |
| 14 #include "content/shell/renderer/shell_content_renderer_client.h" | 14 #include "content/shell/renderer/shell_content_renderer_client.h" |
| 15 #include "content/shell/renderer/test_runner/WebTestInterfaces.h" | 15 #include "content/shell/renderer/test_runner/WebTestInterfaces.h" |
| 16 #include "content/shell/renderer/webkit_test_runner.h" | 16 #include "content/shell/renderer/webkit_test_runner.h" |
| 17 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | 17 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
| 18 #include "third_party/WebKit/public/web/WebView.h" | 18 #include "third_party/WebKit/public/web/WebView.h" |
| 19 #include "v8/include/v8.h" | 19 #include "v8/include/v8.h" |
| 20 | 20 |
| 21 using blink::WebFrame; | 21 using blink::WebFrame; |
| 22 using blink::WebRuntimeFeatures; | 22 using blink::WebRuntimeFeatures; |
| 23 using WebTestRunner::WebTestDelegate; | |
| 24 using WebTestRunner::WebTestInterfaces; | |
| 25 | 23 |
| 26 namespace content { | 24 namespace content { |
| 27 | 25 |
| 28 namespace { | 26 namespace { |
| 29 ShellRenderProcessObserver* g_instance = NULL; | 27 ShellRenderProcessObserver* g_instance = NULL; |
| 30 } | 28 } |
| 31 | 29 |
| 32 // static | 30 // static |
| 33 ShellRenderProcessObserver* ShellRenderProcessObserver::GetInstance() { | 31 ShellRenderProcessObserver* ShellRenderProcessObserver::GetInstance() { |
| 34 return g_instance; | 32 return g_instance; |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 | 90 |
| 93 return handled; | 91 return handled; |
| 94 } | 92 } |
| 95 | 93 |
| 96 void ShellRenderProcessObserver::OnSetWebKitSourceDir( | 94 void ShellRenderProcessObserver::OnSetWebKitSourceDir( |
| 97 const base::FilePath& webkit_source_dir) { | 95 const base::FilePath& webkit_source_dir) { |
| 98 webkit_source_dir_ = webkit_source_dir; | 96 webkit_source_dir_ = webkit_source_dir; |
| 99 } | 97 } |
| 100 | 98 |
| 101 } // namespace content | 99 } // namespace content |
| OLD | NEW |