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" |
| 13 #include "content/shell/common/shell_switches.h" |
12 #include "content/shell/renderer/shell_content_renderer_client.h" | 14 #include "content/shell/renderer/shell_content_renderer_client.h" |
13 #include "content/shell/renderer/webkit_test_runner.h" | 15 #include "content/shell/renderer/webkit_test_runner.h" |
14 #include "content/shell/shell_messages.h" | |
15 #include "content/shell/shell_switches.h" | |
16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
17 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
TestInterfaces.h" | 17 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
TestInterfaces.h" |
18 #include "webkit/glue/webkit_glue.h" | 18 #include "webkit/glue/webkit_glue.h" |
19 #include "webkit/support/gc_extension.h" | 19 #include "webkit/support/gc_extension.h" |
20 | 20 |
21 using WebKit::WebFrame; | 21 using WebKit::WebFrame; |
22 using WebTestRunner::WebTestDelegate; | 22 using WebTestRunner::WebTestDelegate; |
23 using WebTestRunner::WebTestInterfaces; | 23 using WebTestRunner::WebTestInterfaces; |
24 | 24 |
25 namespace content { | 25 namespace content { |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 webkit_source_dir_ = webkit_source_dir; | 94 webkit_source_dir_ = webkit_source_dir; |
95 } | 95 } |
96 | 96 |
97 void ShellRenderProcessObserver::OnLoadHyphenDictionary( | 97 void ShellRenderProcessObserver::OnLoadHyphenDictionary( |
98 const IPC::PlatformFileForTransit& dict_file) { | 98 const IPC::PlatformFileForTransit& dict_file) { |
99 ShellContentRendererClient::Get()->LoadHyphenDictionary( | 99 ShellContentRendererClient::Get()->LoadHyphenDictionary( |
100 IPC::PlatformFileForTransitToPlatformFile(dict_file)); | 100 IPC::PlatformFileForTransitToPlatformFile(dict_file)); |
101 } | 101 } |
102 | 102 |
103 } // namespace content | 103 } // namespace content |
OLD | NEW |