diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 07:31:38 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 07:31:38 +0000 |
| commit | 0fef693f2702d132e5a9b9545c309d81efd81f72 (patch) | |
| tree | 18c513debe7f8e3f5364cde6d0e53bb1942485b8 /ui/base/dragdrop | |
| parent | 88f8e4033f6a39e1490523501a5ffa5e8805d7ea (diff) | |
| download | chromium_src-0fef693f2702d132e5a9b9545c309d81efd81f72.zip chromium_src-0fef693f2702d132e5a9b9545c309d81efd81f72.tar.gz chromium_src-0fef693f2702d132e5a9b9545c309d81efd81f72.tar.bz2 | |
Revert 160089 - Fix OneClickSigninHelperTest.CanOffer failures due to not having OLE initialized after r159815.
This change reverts r159881, r159982, and r160020, and fixes the core bug.
BUG=153741
TEST=none
Review URL: https://codereview.chromium.org/11036030
TBR=pkasting@chromium.org
Review URL: https://codereview.chromium.org/11066008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/dragdrop')
| -rw-r--r-- | ui/base/dragdrop/drop_target.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ui/base/dragdrop/drop_target.cc b/ui/base/dragdrop/drop_target.cc index 84b2745..0783ddd 100644 --- a/ui/base/dragdrop/drop_target.cc +++ b/ui/base/dragdrop/drop_target.cc @@ -16,14 +16,8 @@ DropTarget::DropTarget(HWND hwnd) : hwnd_(hwnd), ref_count_(0) { DCHECK(hwnd); - // The main browser process registers OLE, as do various test runners; if you - // fail the next call, you're presumably reaching here from test code that - // doesn't trigger any of those spots. Adding an appropriate - // ScopedOleInitializer will fix this, but beware you don't add it somewhere - // that causes nested initializations for some other test, which will add log - // warnings. HRESULT result = RegisterDragDrop(hwnd, this); - DCHECK(SUCCEEDED(result)) << "OLE is not initialized"; + DCHECK(SUCCEEDED(result)); } DropTarget::~DropTarget() { |