Fix 2 drag-out problems:...

app/os_exchange_data_provider_win.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/os_exchange_data_provider_win.h"
 
 #include "app/clipboard/clipboard_util_win.h"
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/i18n/file_util_icu.h"
@@ skipping 615 matching lines @@
           // yet, it probably means that the target does not support delay-
           // rendering. So instead, we wait for the data.
           if (is_left_button_down) {
             (*iter)->in_delay_rendering = true;
             memset(medium, 0, sizeof(STGMEDIUM));
           } else {
             wait_for_data = true;
           }
         }
 
-        if (wait_for_data) {
-          // Notify the observer we start waiting for the data. This gives
-          // an observer a chance to end the drag and drop.
-          if (observer_)
-            observer_->OnWaitForData();
+        if (!wait_for_data)
+          return DV_E_FORMATETC;
 
-          // Now we can start the download.
-          if ((*iter)->downloader.get()) {
-            if (!(*iter)->downloader->Start(this)) {
-              is_aborting_ = true;
-              return DV_E_FORMATETC;
-            }
+        // Notify the observer we start waiting for the data. This gives
+        // an observer a chance to end the drag and drop.
+        if (observer_)
+          observer_->OnWaitForData();
+
+        // Now we can start the download.
+        if ((*iter)->downloader.get()) {
+          if (!(*iter)->downloader->Start(this)) {
+            is_aborting_ = true;
+            return DV_E_FORMATETC;
           }
+        }
 
-          // The stored data should have been updated with the final version.
-          // So we just need to call this function again to retrieve it.
-          return GetData(format_etc, medium);
-        }
+        // The stored data should have been updated with the final version.
+        // So we just need to call this function again to retrieve it.
+        return GetData(format_etc, medium);
       }
       return S_OK;
     }
     ++iter;
   }
 
   return DV_E_FORMATETC;
 }
 
 HRESULT DataObjectImpl::GetDataHere(FORMATETC* format_etc,
@@ skipping 245 matching lines @@
 // static
 OSExchangeData::Provider* OSExchangeData::CreateProvider() {
   return new OSExchangeDataProviderWin();
 }
 
 // static
 OSExchangeData::CustomFormat OSExchangeData::RegisterCustomFormat(
     const std::string& type) {
   return RegisterClipboardFormat(ASCIIToWide(type).c_str());
 }