diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 03:56:18 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 03:56:18 +0000 |
| commit | 6f0db2b2c15a0919bbeeb6568c69b7196b186d27 (patch) | |
| tree | a9e1c0067cba88556eff8541dfd87b09acd0a16c /remoting/host | |
| parent | 46db9f43fe29b92895d3138a22d3bc042632135a (diff) | |
| download | chromium_src-6f0db2b2c15a0919bbeeb6568c69b7196b186d27.zip chromium_src-6f0db2b2c15a0919bbeeb6568c69b7196b186d27.tar.gz chromium_src-6f0db2b2c15a0919bbeeb6568c69b7196b186d27.tar.bz2 | |
Revert 121840 - Make scoped dc objects smarter
So we don't destroy the dc with gdi objects selected.
Also remove implicit conversion to HDC.
BUG=110113,113683
TEST=chrome runs, base unittests green.
Review URL: https://chromiumcodereview.appspot.com/9212020
TBR=cpu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9387027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/disconnect_window_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc index 63d420f..a9f7742 100644 --- a/remoting/host/disconnect_window_win.cc +++ b/remoting/host/disconnect_window_win.cc @@ -214,8 +214,8 @@ static int GetControlTextWidth(HWND control) { if (result) { base::win::ScopedGetDC dc(control); base::win::ScopedSelectObject font( - dc.get(), (HFONT)SendMessage(control, WM_GETFONT, 0, 0)); - DrawText(dc.get(), text, -1, &rect, DT_CALCRECT|DT_SINGLELINE); + dc, (HFONT)SendMessage(control, WM_GETFONT, 0, 0)); + DrawText(dc, text, -1, &rect, DT_CALCRECT|DT_SINGLELINE); } return rect.right; } |