mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
378a64b39a
- Remove CefNavigationEntry::GetFrameName() (see http://crbug.com/477150#c5). - Devirtualize base::BindState (see http://crbug.com/486594). - Move Tuple to the base namespace.
15 lines
622 B
Diff
15 lines
622 B
Diff
diff --git os_exchange_data_provider_aurax11.cc os_exchange_data_provider_aurax11.cc
|
|
index c9285a0..f82f90a 100644
|
|
--- os_exchange_data_provider_aurax11.cc
|
|
+++ os_exchange_data_provider_aurax11.cc
|
|
@@ -158,7 +158,8 @@ void OSExchangeDataProviderAuraX11::SetURL(const GURL& url,
|
|
format_map_.Insert(atom_cache_.GetAtom(kMimeTypeMozillaURL), mem);
|
|
|
|
// Set a string fallback as well.
|
|
- SetString(spec);
|
|
+ if (!HasString())
|
|
+ SetString(spec);
|
|
|
|
// Return early if this drag already contains file contents (this implies
|
|
// that file contents must be populated before URLs). Nautilus (and possibly
|