diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:12:24 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:12:24 +0000 |
| commit | 854b05960356663e95ebac13cea73b2fde58ba5c (patch) | |
| tree | c26c7adb1637996ec09ef2643e5629f1d4a94d30 /ui/base | |
| parent | c482f732e49e083fc54bfd30aa729680a3d0c599 (diff) | |
| download | chromium_src-854b05960356663e95ebac13cea73b2fde58ba5c.zip chromium_src-854b05960356663e95ebac13cea73b2fde58ba5c.tar.gz chromium_src-854b05960356663e95ebac13cea73b2fde58ba5c.tar.bz2 | |
Minor build fixes for aura/touchui
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8568010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_aura.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.cc b/ui/base/dragdrop/os_exchange_data_provider_aura.cc index 18b4128..349b89f 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aura.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.cc @@ -69,7 +69,8 @@ OSExchangeData::Provider* OSExchangeData::CreateProvider() { } // static -void* OSExchangeData::RegisterCustomFormat(const std::string& type) { +OSExchangeData::CustomFormat +OSExchangeData::RegisterCustomFormat(const std::string& type) { // TODO(davemoore) Implement this for aura. return NULL; } |