summaryrefslogtreecommitdiffstats
path: root/content/content_shell.gypi
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 20:11:30 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 20:11:30 +0000
commit14d91b56f7d5784ad02f24da838ff5e82c74bbfa (patch)
treed55e9a9b0d1b9af8e5715af86ed6d50920b9aee8 /content/content_shell.gypi
parent32fab76701d40c87151c0c7750cb19b2da3d8c87 (diff)
downloadchromium_src-14d91b56f7d5784ad02f24da838ff5e82c74bbfa.zip
chromium_src-14d91b56f7d5784ad02f24da838ff5e82c74bbfa.tar.gz
chromium_src-14d91b56f7d5784ad02f24da838ff5e82c74bbfa.tar.bz2
Revert 140814 - Rename ShellRenderView{,Host}Observer to LayoutTestController{,Host}
also hook up the stay on page after handling before unload flag. BUG=111316 TEST=manual Review URL: https://chromiumcodereview.appspot.com/10544029 TBR=jochen@chromium.org Review URL: https://chromiumcodereview.appspot.com/10537034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
-rw-r--r--content/content_shell.gypi8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index c8fc373..588723e 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -46,12 +46,8 @@
'..',
],
'sources': [
- 'shell/layout_test_controller.cc',
- 'shell/layout_test_controller.h',
'shell/layout_test_controller_bindings.cc',
'shell/layout_test_controller_bindings.h',
- 'shell/layout_test_controller_host.cc',
- 'shell/layout_test_controller_host.h',
'shell/paths_mac.h',
'shell/paths_mac.mm',
'shell/shell.cc',
@@ -96,6 +92,10 @@
'shell/shell_network_delegate.h',
'shell/shell_render_process_observer.cc',
'shell/shell_render_process_observer.h',
+ 'shell/shell_render_view_host_observer.cc',
+ 'shell/shell_render_view_host_observer.h',
+ 'shell/shell_render_view_observer.cc',
+ 'shell/shell_render_view_observer.h',
'shell/shell_resource_context.cc',
'shell/shell_resource_context.h',
'shell/shell_resource_dispatcher_host_delegate.cc',