diff options
author | andresantoso@chromium.org <andresantoso@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-16 20:40:51 +0000 |
---|---|---|
committer | andresantoso@chromium.org <andresantoso@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-16 20:40:51 +0000 |
commit | c99ac682e5758700ac5b819839c110c21af6d3ba (patch) | |
tree | 9ed20a7019f86fa3ab8f1804df8f3cb0e9fffc0b /ui | |
parent | 05abcdf418fea5b04c6082db1b1de871b9aef04a (diff) | |
download | chromium_src-c99ac682e5758700ac5b819839c110c21af6d3ba.zip chromium_src-c99ac682e5758700ac5b819839c110c21af6d3ba.tar.gz chromium_src-c99ac682e5758700ac5b819839c110c21af6d3ba.tar.bz2 |
MacViews: Skeleton implementation of OSExchangeDataProviderMac.
This gets ui_unittests to compile and not crash when TOOLKIT_VIEWS=1 on Mac
(but there are still 7 failures).
Review URL: https://codereview.chromium.org/337833002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_mac.h | 50 | ||||
-rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_mac.mm | 106 | ||||
-rw-r--r-- | ui/base/dragdrop/os_exchange_data_unittest.cc | 2 | ||||
-rw-r--r-- | ui/base/ui_base.gyp | 1 |
4 files changed, 154 insertions, 5 deletions
diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.h b/ui/base/dragdrop/os_exchange_data_provider_mac.h new file mode 100644 index 0000000..513239f --- /dev/null +++ b/ui/base/dragdrop/os_exchange_data_provider_mac.h @@ -0,0 +1,50 @@ +// Copyright 2014 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. + +#ifndef UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_MAC_H_ +#define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_MAC_H_ + +#include "ui/base/dragdrop/os_exchange_data.h" + +namespace ui { + +// OSExchangeData::Provider implementation for Mac. +class UI_BASE_EXPORT OSExchangeDataProviderMac + : public OSExchangeData::Provider { + public: + OSExchangeDataProviderMac(); + virtual ~OSExchangeDataProviderMac(); + + // Overridden from OSExchangeData::Provider: + virtual Provider* Clone() const OVERRIDE; + virtual void MarkOriginatedFromRenderer() OVERRIDE; + virtual bool DidOriginateFromRenderer() const OVERRIDE; + virtual void SetString(const base::string16& data) OVERRIDE; + virtual void SetURL(const GURL& url, const base::string16& title) OVERRIDE; + virtual void SetFilename(const base::FilePath& path) OVERRIDE; + virtual void SetFilenames(const std::vector<FileInfo>& filenames) OVERRIDE; + virtual void SetPickledData(const OSExchangeData::CustomFormat& format, + const Pickle& data) OVERRIDE; + virtual bool GetString(base::string16* data) const OVERRIDE; + virtual bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy, + GURL* url, + base::string16* title) const OVERRIDE; + virtual bool GetFilename(base::FilePath* path) const OVERRIDE; + virtual bool GetFilenames(std::vector<FileInfo>* filenames) const OVERRIDE; + virtual bool GetPickledData(const OSExchangeData::CustomFormat& format, + Pickle* data) const OVERRIDE; + virtual bool HasString() const OVERRIDE; + virtual bool HasURL( + OSExchangeData::FilenameToURLPolicy policy) const OVERRIDE; + virtual bool HasFile() const OVERRIDE; + virtual bool HasCustomFormat( + const OSExchangeData::CustomFormat& format) const OVERRIDE; + + private: + DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderMac); +}; + +} // namespace ui + +#endif // UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_MAC_H_ diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.mm b/ui/base/dragdrop/os_exchange_data_provider_mac.mm index fa9b87a..e8e60c3 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_mac.mm +++ b/ui/base/dragdrop/os_exchange_data_provider_mac.mm @@ -2,19 +2,115 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/dragdrop/os_exchange_data_provider_mac.h" #include "base/logging.h" +namespace ui { + +OSExchangeDataProviderMac::OSExchangeDataProviderMac() { +} + +OSExchangeDataProviderMac::~OSExchangeDataProviderMac() { +} + +OSExchangeData::Provider* OSExchangeDataProviderMac::Clone() const { + NOTIMPLEMENTED(); + return new OSExchangeDataProviderMac(); +} + +void OSExchangeDataProviderMac::MarkOriginatedFromRenderer() { + NOTIMPLEMENTED(); +} + +bool OSExchangeDataProviderMac::DidOriginateFromRenderer() const { + NOTIMPLEMENTED(); + return false; +} + +void OSExchangeDataProviderMac::SetString(const base::string16& string) { + NOTIMPLEMENTED(); +} + +void OSExchangeDataProviderMac::SetURL(const GURL& url, + const base::string16& title) { + NOTIMPLEMENTED(); +} + +void OSExchangeDataProviderMac::SetFilename(const base::FilePath& path) { + NOTIMPLEMENTED(); +} + +void OSExchangeDataProviderMac::SetFilenames( + const std::vector<FileInfo>& filenames) { + NOTIMPLEMENTED(); +} + +void OSExchangeDataProviderMac::SetPickledData( + const OSExchangeData::CustomFormat& format, + const Pickle& data) { + NOTIMPLEMENTED(); +} + +bool OSExchangeDataProviderMac::GetString(base::string16* data) const { + NOTIMPLEMENTED(); + return false; +} + +bool OSExchangeDataProviderMac::GetURLAndTitle( + OSExchangeData::FilenameToURLPolicy policy, + GURL* url, + base::string16* title) const { + NOTIMPLEMENTED(); + return false; +} + +bool OSExchangeDataProviderMac::GetFilename(base::FilePath* path) const { + NOTIMPLEMENTED(); + return false; +} + +bool OSExchangeDataProviderMac::GetFilenames( + std::vector<FileInfo>* filenames) const { + NOTIMPLEMENTED(); + return false; +} + +bool OSExchangeDataProviderMac::GetPickledData( + const OSExchangeData::CustomFormat& format, + Pickle* data) const { + NOTIMPLEMENTED(); + return false; +} + +bool OSExchangeDataProviderMac::HasString() const { + NOTIMPLEMENTED(); + return false; +} + +bool OSExchangeDataProviderMac::HasURL( + OSExchangeData::FilenameToURLPolicy policy) const { + NOTIMPLEMENTED(); + return false; +} + +bool OSExchangeDataProviderMac::HasFile() const { + NOTIMPLEMENTED(); + return false; +} + +bool OSExchangeDataProviderMac::HasCustomFormat( + const OSExchangeData::CustomFormat& format) const { + NOTIMPLEMENTED(); + return false; +} + /////////////////////////////////////////////////////////////////////////////// // OSExchangeData, public: -namespace ui { - // static OSExchangeData::Provider* OSExchangeData::CreateProvider() { - NOTIMPLEMENTED(); - return NULL; + return new OSExchangeDataProviderMac; } } // namespace ui diff --git a/ui/base/dragdrop/os_exchange_data_unittest.cc b/ui/base/dragdrop/os_exchange_data_unittest.cc index 8c5e75d..41dd43a 100644 --- a/ui/base/dragdrop/os_exchange_data_unittest.cc +++ b/ui/base/dragdrop/os_exchange_data_unittest.cc @@ -88,6 +88,7 @@ TEST_F(OSExchangeDataTest, TestPickledData) { EXPECT_EQ(2, value); } +#if defined(USE_AURA) TEST_F(OSExchangeDataTest, TestHTML) { OSExchangeData data; GURL url("http://www.google.com/"); @@ -102,5 +103,6 @@ TEST_F(OSExchangeDataTest, TestHTML) { EXPECT_TRUE(copy.GetHtml(&read_html, &url)); EXPECT_EQ(html, read_html); } +#endif } // namespace ui diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp index faebd7b..ec69b13 100644 --- a/ui/base/ui_base.gyp +++ b/ui/base/ui_base.gyp @@ -169,6 +169,7 @@ 'dragdrop/os_exchange_data_provider_aura.h', 'dragdrop/os_exchange_data_provider_aurax11.cc', 'dragdrop/os_exchange_data_provider_aurax11.h', + 'dragdrop/os_exchange_data_provider_mac.h', 'dragdrop/os_exchange_data_provider_mac.mm', 'dragdrop/os_exchange_data_provider_win.cc', 'dragdrop/os_exchange_data_provider_win.h', |