From 4f5c4b89293b9cd686468e7e921df16aa80d891b Mon Sep 17 00:00:00 2001 From: "rkc@chromium.org" Date: Wed, 2 May 2012 09:10:14 +0000 Subject: Revert 134878 - Re-implement the screensaver to use WebView instead of ExtensionDialogHost. Use WebView to render the screensaver extension instead of ExtensionDialogHost. Using the RenderViewGone override to detect termination of the renderer process to restart it. Added browser tests. R=ben@chromium.org,sky@chromium.org BUG=chromium-os:28211 TEST=Tested that the screensaver comes up; tested the reload via crashing the extension renderer with SIG_ABRT; also ran browser tests. Review URL: https://chromiumcodereview.appspot.com/10191010 TBR=rkc@chromium.org Review URL: https://chromiumcodereview.appspot.com/10316004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134881 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/views.gyp | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) (limited to 'ui/views/views.gyp') diff --git a/ui/views/views.gyp b/ui/views/views.gyp index e83e467..7919b8e 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -451,32 +451,6 @@ ], }, # target_name: views { - 'target_name': 'test_support_views', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:base', - '../../content/content.gyp:test_support_content', - '../../ipc/ipc.gyp:test_support_ipc', - '../../net/net.gyp:net_test_support', - '../../skia/skia.gyp:skia', - '../../testing/gtest.gyp:gtest', - '../ui.gyp:ui', - 'views', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'test/test_tooltip_client.h', - 'test/test_views_delegate.cc', - 'test/test_views_delegate.h', - 'test/views_test_base.cc', - 'test/views_test_base.h', - 'test/webview_test_helper.cc', - 'test/webview_test_helper.h', - ], - }, # target_name: test_support_views - { 'target_name': 'views_unittests', 'type': 'executable', 'dependencies': [ @@ -499,7 +473,6 @@ '../ui.gyp:ui', '../ui.gyp:ui_resources', '../ui.gyp:ui_resources_standard', - 'test_support_views', 'views', ], 'include_dirs': [ @@ -531,6 +504,11 @@ 'focus/focus_traversal_unittest.cc', 'layout/box_layout_unittest.cc', 'layout/grid_layout_unittest.cc', + 'test/test_tooltip_client.h', + 'test/test_views_delegate.cc', + 'test/test_views_delegate.h', + 'test/views_test_base.cc', + 'test/views_test_base.h', 'view_model_unittest.cc', 'view_model_utils_unittest.cc', 'view_unittest.cc', @@ -677,7 +655,6 @@ '../../chrome/chrome_resources.gyp:packed_resources', '../../content/content.gyp:content_shell_lib', '../../content/content.gyp:content', - '../../content/content.gyp:test_support_content', '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', -- cgit v1.1