diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 02:06:01 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 02:06:01 +0000 |
| commit | 4a6bef33b6897ceff27eee304afe1a6da5fee4ff (patch) | |
| tree | 64c7e2cb508ccbe6a9e50be1da7c99b016ea5b52 /ui/gfx/image | |
| parent | ccb824344b58ae4acbc0b7b30ebcba048a032836 (diff) | |
| download | chromium_src-4a6bef33b6897ceff27eee304afe1a6da5fee4ff.zip chromium_src-4a6bef33b6897ceff27eee304afe1a6da5fee4ff.tar.gz chromium_src-4a6bef33b6897ceff27eee304afe1a6da5fee4ff.tar.bz2 | |
aura: A few changes to have aura_demo compile and run on linux.
* Make 'aura' a component, and export Desktop and Window.
* Events (Key and Mouse) from X Events.
* Rip non-gtk bits out of gfx/gtk_util into gfx/linux_util
BUG=93934,93933
TEST=none
Review URL: http://codereview.chromium.org/7833016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/image')
| -rw-r--r-- | ui/gfx/image/image.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc index 9bd6842..7dc6e62 100644 --- a/ui/gfx/image/image.cc +++ b/ui/gfx/image/image.cc @@ -354,7 +354,10 @@ internal::ImageRep* Image::GetRepresentation( if (default_rep->type() == Image::kImageRepSkia) { internal::ImageRepSkia* skia_rep = default_rep->AsImageRepSkia(); internal::ImageRep* native_rep = NULL; -#if defined(TOOLKIT_USES_GTK) +#if defined(USE_AURA) + skia_rep = NULL; + NOTIMPLEMENTED(); +#elif defined(TOOLKIT_USES_GTK) if (rep_type == Image::kImageRepGdk) { GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(skia_rep->bitmap()); native_rep = new internal::ImageRepGdk(pixbuf); |