diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 23:02:26 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 23:02:26 +0000 |
| commit | 43cbb7c51cdf2a63f21dfd1cc6294411dcc42ec0 (patch) | |
| tree | da8f7178e2d1ec076a865e31bea2cad458178782 /remoting | |
| parent | 949cc5861daa2e638af3e7873b5be8fbd8937860 (diff) | |
| download | chromium_src-43cbb7c51cdf2a63f21dfd1cc6294411dcc42ec0.zip chromium_src-43cbb7c51cdf2a63f21dfd1cc6294411dcc42ec0.tar.gz chromium_src-43cbb7c51cdf2a63f21dfd1cc6294411dcc42ec0.tar.bz2 | |
Fix chromoting build issues on Windows
Fixed compilation errors on windows.
TEST=chromoting builds on windows
Review URL: http://codereview.chromium.org/2711001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/chromoting.gyp | 3 | ||||
| -rw-r--r-- | remoting/host/capturer_gdi.cc | 8 | ||||
| -rw-r--r-- | remoting/host/capturer_gdi.h | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/remoting/chromoting.gyp b/remoting/chromoting.gyp index 1636a76..187bb8b 100644 --- a/remoting/chromoting.gyp +++ b/remoting/chromoting.gyp @@ -110,7 +110,6 @@ 'export_dependent_settings': [ '../third_party/protobuf2/protobuf.gyp:protobuf_lite', 'base/protocol/chromotocol.gyp:chromotocol_proto_lib', - 'chromoting_jingle_glue', # TODO(hclam): Enable VP8 in the build. #'third_party/on2/on2.gyp:vp8', ], @@ -236,9 +235,9 @@ 'target_name': 'chromoting_jingle_glue', 'type': '<(library)', 'dependencies': [ + '../chrome/chrome.gyp:notifier', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libjingle/libjingle.gyp:libjingle_p2p', - '../chrome/chrome.gyp:notifier', ], 'export_dependent_settings': [ '../third_party/libjingle/libjingle.gyp:libjingle', diff --git a/remoting/host/capturer_gdi.cc b/remoting/host/capturer_gdi.cc index 45e5224..3b5a844 100644 --- a/remoting/host/capturer_gdi.cc +++ b/remoting/host/capturer_gdi.cc @@ -66,15 +66,11 @@ void CapturerGdi::GetDataStride(int strides[]) const { } int CapturerGdi::GetWidth() const { - if (!width_) - width_ = GetSystemMetrics(SM_CXSCREEN); - return width_; + return GetSystemMetrics(SM_CXSCREEN); } int CapturerGdi::GetHeight() const { - if (!height_) - height_ = GetSystemMetrics(SM_CYSCREEN); - return height_; + return GetSystemMetrics(SM_CYSCREEN); } // TODO(fbarchard): handle error cases. diff --git a/remoting/host/capturer_gdi.h b/remoting/host/capturer_gdi.h index 7ccda6c..a132923 100644 --- a/remoting/host/capturer_gdi.h +++ b/remoting/host/capturer_gdi.h @@ -26,8 +26,8 @@ class CapturerGdi : public Capturer { virtual void CaptureRect(const gfx::Rect& rect, Task* done_task); virtual void GetData(const uint8* planes[]) const; virtual void GetDataStride(int strides[]) const; - virtual void GetWidth() const; - virtual void GetHeight() const; + virtual int GetWidth() const; + virtual int GetHeight() const; private: // Initialize GDI structures. |