diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 21:42:02 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 21:42:02 +0000 |
| commit | 3580aaf313e8fbfbec870e76a10a2461ab3f30c0 (patch) | |
| tree | cebd7a2fe7a09cefacd6c0680b1e14d2e4ccb74e /ui/base/clipboard/custom_data_helper_mac.mm | |
| parent | 60e9143637b518ac1d977c055922321082aaa818 (diff) | |
| download | chromium_src-3580aaf313e8fbfbec870e76a10a2461ab3f30c0.zip chromium_src-3580aaf313e8fbfbec870e76a10a2461ab3f30c0.tar.gz chromium_src-3580aaf313e8fbfbec870e76a10a2461ab3f30c0.tar.bz2 | |
Make aura_demo work on Mac
Fix a few instances where !Windows is assumed to be Linux.
Chang many instances of !USE_GTK_MESSAGE_PUMP &&
!OS_MACOSX && !OS_ANDROID to just USE_AURA (they are
equivalent now).
Add a very minimal RootWindowHostMac.
Of note is that building with Aura requires running
"gyp_chromium --no-circular-check" (the circular
check is only enabled on Mac, and doesn't work with
Aura).
Also note that the demo does not work properly unless BGRA
support is disabled (in FeatureInfo::InitializeBasicState these
extensions can be disabled).
BUG=331669
Review URL: https://codereview.chromium.org/110283005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/clipboard/custom_data_helper_mac.mm')
| -rw-r--r-- | ui/base/clipboard/custom_data_helper_mac.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/base/clipboard/custom_data_helper_mac.mm b/ui/base/clipboard/custom_data_helper_mac.mm index 5447ae3..ae43621 100644 --- a/ui/base/clipboard/custom_data_helper_mac.mm +++ b/ui/base/clipboard/custom_data_helper_mac.mm @@ -9,6 +9,10 @@ namespace ui { // TODO(dcheng): This name is temporary. See crbug.com/106449. +#if defined(USE_AURA) +const char kMimeTypeWebCustomData[] = "chromium/x-web-custom-data"; +#else NSString* const kWebCustomDataPboardType = @"org.chromium.web-custom-data"; +#endif } // namespace ui |