diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 19:07:56 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 19:07:56 +0000 |
| commit | e88b4dbe0d8f101606359401a0bf1991d26e546a (patch) | |
| tree | 3816bc5992a86bfa7f2bf80f7a7cc43090373c6d /content | |
| parent | 6d470f2716906ecec3acbd7a427cadbc2a1f66bf (diff) | |
| download | chromium_src-e88b4dbe0d8f101606359401a0bf1991d26e546a.zip chromium_src-e88b4dbe0d8f101606359401a0bf1991d26e546a.tar.gz chromium_src-e88b4dbe0d8f101606359401a0bf1991d26e546a.tar.bz2 | |
Move resource_dispatcher_host_unittest.cc to content_unittests now that all its link time dependencies are in content.
BUG=90443
Review URL: http://codereview.chromium.org/7746008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view.cc | 13 | ||||
| -rw-r--r-- | content/content_browser.gypi | 13 | ||||
| -rw-r--r-- | content/content_tests.gypi | 1 |
3 files changed, 27 insertions, 0 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view.cc b/content/browser/renderer_host/render_widget_host_view.cc index a3b4d8c..f96559c 100644 --- a/content/browser/renderer_host/render_widget_host_view.cc +++ b/content/browser/renderer_host/render_widget_host_view.cc @@ -4,6 +4,19 @@ #include "content/browser/renderer_host/render_widget_host_view.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h" + +// TODO(jam): move this to render_widget_host_view_mac.mm when it moves to +// content. +#if defined(OS_MACOSX) +// static +void RenderWidgetHostView::GetDefaultScreenInfo( + WebKit::WebScreenInfo* results) { + *results = WebKit::WebScreenInfoFactory::screenInfo(NULL); +} +#endif + RenderWidgetHostView::~RenderWidgetHostView() {} void RenderWidgetHostView::SetBackground(const SkBitmap& background) { diff --git a/content/content_browser.gypi b/content/content_browser.gypi index b0f14bc..db946e5 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -546,6 +546,14 @@ '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', '../third_party/isimpledom/isimpledom.gyp:isimpledom', ], + 'direct_dependent_settings': { + 'link_settings': { + 'libraries': [ + '-llocationapi.lib', + '-lsensorsapi.lib', + ], + } + }, 'sources!': [ 'browser/power_save_blocker_stub.cc', ], @@ -566,6 +574,11 @@ ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'], ] }], + ['OS=="linux" and toolkit_views==1',{ + 'dependencies': [ + '../views/views.gyp:views', + ], + }], ['OS=="mac"', { 'sources!': [ 'browser/power_save_blocker_stub.cc', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index f1124aa..817cf28 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -90,6 +90,7 @@ 'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc', 'browser/renderer_host/media/video_capture_host_unittest.cc', 'browser/renderer_host/media/video_capture_manager_unittest.cc', + 'browser/renderer_host/resource_dispatcher_host_unittest.cc', 'browser/renderer_host/resource_queue_unittest.cc', 'browser/resolve_proxy_msg_helper_unittest.cc', 'browser/speech/endpointer/endpointer_unittest.cc', |