diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 15:29:58 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 15:29:58 +0000 |
commit | f7a4e3b92572a5a657262566de380c76d3490173 (patch) | |
tree | ecc97a3ea839574a0435c191833751f39549d8d0 | |
parent | a2a4e5f9094ae7e85d3662160ecfa253731ebb32 (diff) | |
download | chromium_src-f7a4e3b92572a5a657262566de380c76d3490173.zip chromium_src-f7a4e3b92572a5a657262566de380c76d3490173.tar.gz chromium_src-f7a4e3b92572a5a657262566de380c76d3490173.tar.bz2 |
[content shell] move renderer specific code into a sub directory
BUG=180021
TBR=jam@chromium.org
R=marja@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14912003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198107 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | content/content_shell.gypi | 12 | ||||
-rw-r--r-- | content/shell/renderer/shell_content_renderer_client.cc (renamed from content/shell/shell_content_renderer_client.cc) | 6 | ||||
-rw-r--r-- | content/shell/renderer/shell_content_renderer_client.h (renamed from content/shell/shell_content_renderer_client.h) | 0 | ||||
-rw-r--r-- | content/shell/renderer/shell_render_process_observer.cc (renamed from content/shell/shell_render_process_observer.cc) | 8 | ||||
-rw-r--r-- | content/shell/renderer/shell_render_process_observer.h (renamed from content/shell/shell_render_process_observer.h) | 0 | ||||
-rw-r--r-- | content/shell/renderer/webkit_test_runner.cc (renamed from content/shell/webkit_test_runner.cc) | 4 | ||||
-rw-r--r-- | content/shell/renderer/webkit_test_runner.h (renamed from content/shell/webkit_test_runner.h) | 0 | ||||
-rw-r--r-- | content/shell/shell_main_delegate.cc | 2 | ||||
-rw-r--r-- | content/test/content_browser_test.cc | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 998dda0..1bf233b 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -72,6 +72,12 @@ 'shell/notify_done_forwarder.h', 'shell/paths_mac.h', 'shell/paths_mac.mm', + 'shell/renderer/shell_content_renderer_client.cc', + 'shell/renderer/shell_content_renderer_client.h', + 'shell/renderer/shell_render_process_observer.cc', + 'shell/renderer/shell_render_process_observer.h', + 'shell/renderer/webkit_test_runner.cc', + 'shell/renderer/webkit_test_runner.h', 'shell/shell.cc', 'shell/shell.h', 'shell/shell_android.cc', @@ -92,8 +98,6 @@ 'shell/shell_content_browser_client.h', 'shell/shell_content_client.cc', 'shell/shell_content_client.h', - 'shell/shell_content_renderer_client.cc', - 'shell/shell_content_renderer_client.h', 'shell/shell_devtools_delegate.cc', 'shell/shell_devtools_delegate.h', 'shell/shell_devtools_frontend.cc', @@ -120,8 +124,6 @@ 'shell/shell_network_delegate.h', 'shell/shell_quota_permission_context.cc', 'shell/shell_quota_permission_context.h', - 'shell/shell_render_process_observer.cc', - 'shell/shell_render_process_observer.h', 'shell/shell_resource_dispatcher_host_delegate.cc', 'shell/shell_resource_dispatcher_host_delegate.h', 'shell/shell_switches.cc', @@ -145,8 +147,6 @@ 'shell/webkit_test_platform_support_linux.cc', 'shell/webkit_test_platform_support_mac.mm', 'shell/webkit_test_platform_support_win.cc', - 'shell/webkit_test_runner.cc', - 'shell/webkit_test_runner.h', ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc index 0623506..293bc0b 100644 --- a/content/shell/shell_content_renderer_client.cc +++ b/content/shell/renderer/shell_content_renderer_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_content_renderer_client.h" +#include "content/shell/renderer/shell_content_renderer_client.h" #include "base/callback.h" #include "base/command_line.h" @@ -11,9 +11,9 @@ #include "content/public/common/content_switches.h" #include "content/public/renderer/render_view.h" #include "content/public/test/layouttest_support.h" -#include "content/shell/shell_render_process_observer.h" +#include "content/shell/renderer/shell_render_process_observer.h" +#include "content/shell/renderer/webkit_test_runner.h" #include "content/shell/shell_switches.h" -#include "content/shell/webkit_test_runner.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamCenter.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/renderer/shell_content_renderer_client.h index 857b5c9..857b5c9 100644 --- a/content/shell/shell_content_renderer_client.h +++ b/content/shell/renderer/shell_content_renderer_client.h diff --git a/content/shell/shell_render_process_observer.cc b/content/shell/renderer/shell_render_process_observer.cc index dc32bef..c0fa05c 100644 --- a/content/shell/shell_render_process_observer.cc +++ b/content/shell/renderer/shell_render_process_observer.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_render_process_observer.h" +#include "content/shell/renderer/shell_render_process_observer.h" #include "base/command_line.h" #include "content/public/common/content_client.h" -#include "content/public/renderer/render_view.h" #include "content/public/renderer/render_thread.h" +#include "content/public/renderer/render_view.h" #include "content/public/test/layouttest_support.h" -#include "content/shell/shell_content_renderer_client.h" +#include "content/shell/renderer/shell_content_renderer_client.h" +#include "content/shell/renderer/webkit_test_runner.h" #include "content/shell/shell_messages.h" #include "content/shell/shell_switches.h" -#include "content/shell/webkit_test_runner.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestInterfaces.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/shell/shell_render_process_observer.h b/content/shell/renderer/shell_render_process_observer.h index bae0347..bae0347 100644 --- a/content/shell/shell_render_process_observer.h +++ b/content/shell/renderer/shell_render_process_observer.h diff --git a/content/shell/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index ef41b09..a090cea 100644 --- a/content/shell/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/webkit_test_runner.h" +#include "content/shell/renderer/webkit_test_runner.h" #include <algorithm> #include <clocale> @@ -21,8 +21,8 @@ #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_visitor.h" #include "content/public/test/layouttest_support.h" +#include "content/shell/renderer/shell_render_process_observer.h" #include "content/shell/shell_messages.h" -#include "content/shell/shell_render_process_observer.h" #include "content/shell/webkit_test_helpers.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/content/shell/webkit_test_runner.h b/content/shell/renderer/webkit_test_runner.h index 0023ec4..0023ec4 100644 --- a/content/shell/webkit_test_runner.h +++ b/content/shell/renderer/webkit_test_runner.h diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc index 2080988..6981321 100644 --- a/content/shell/shell_main_delegate.cc +++ b/content/shell/shell_main_delegate.cc @@ -11,9 +11,9 @@ #include "content/public/browser/browser_main_runner.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" +#include "content/shell/renderer/shell_content_renderer_client.h" #include "content/shell/shell_browser_main.h" #include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_content_renderer_client.h" #include "content/shell/shell_switches.h" #include "content/shell/webkit_test_platform_support.h" #include "content/public/test/layouttest_support.h" diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc index 90e4d8c..27f3097 100644 --- a/content/test/content_browser_test.cc +++ b/content/test/content_browser_test.cc @@ -12,10 +12,10 @@ #include "content/public/browser/render_process_host.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" +#include "content/shell/renderer/shell_content_renderer_client.h" #include "content/shell/shell.h" #include "content/shell/shell_browser_context.h" #include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_content_renderer_client.h" #include "content/shell/shell_main_delegate.h" #include "content/shell/shell_switches.h" #include "content/test/test_content_client.h" |