summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 23:02:26 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 23:02:26 +0000
commit43cbb7c51cdf2a63f21dfd1cc6294411dcc42ec0 (patch)
treeda8f7178e2d1ec076a865e31bea2cad458178782 /remoting/host
parent949cc5861daa2e638af3e7873b5be8fbd8937860 (diff)
downloadchromium_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/host')
-rw-r--r--remoting/host/capturer_gdi.cc8
-rw-r--r--remoting/host/capturer_gdi.h4
2 files changed, 4 insertions, 8 deletions
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.