diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 22:39:43 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 22:39:43 +0000 |
| commit | 45f9c8f5200a9b3bc8990d5ba650da8dc47e7144 (patch) | |
| tree | ab11af24ec0692149baba6a08b0391943f481e82 /ui | |
| parent | 00614a87478e404184cab3a521ec6fd1cdbd5b8e (diff) | |
| download | chromium_src-45f9c8f5200a9b3bc8990d5ba650da8dc47e7144.zip chromium_src-45f9c8f5200a9b3bc8990d5ba650da8dc47e7144.tar.gz chromium_src-45f9c8f5200a9b3bc8990d5ba650da8dc47e7144.tar.bz2 | |
Use Skia image in GetNativeImageNamed for aura/linux.
Skia is native in this configuration
Added log message in events_x to diagnose the problem.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8205016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/resource/resource_bundle_linux.cc | 6 | ||||
| -rw-r--r-- | ui/base/x/events_x.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/base/resource/resource_bundle_linux.cc b/ui/base/resource/resource_bundle_linux.cc index 14000ce..64652ec 100644 --- a/ui/base/resource/resource_bundle_linux.cc +++ b/ui/base/resource/resource_bundle_linux.cc @@ -75,12 +75,12 @@ FilePath ResourceBundle::GetLargeIconResourcesFilePath() { return FilePath(); } -gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) { +gfx::Image& ResourceBundle:: +GetNativeImageNamed(int resource_id) { #if defined(TOOLKIT_USES_GTK) return *GetPixbufImpl(resource_id, false); #else - static gfx::Image image(NULL); - return image; + return GetImageNamed(resource_id); #endif } diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc index 71687d4..a5db937 100644 --- a/ui/base/x/events_x.cc +++ b/ui/base/x/events_x.cc @@ -170,7 +170,7 @@ EventType EventTypeFromNative(const base::NativeEvent& native_event) { } } default: - NOTREACHED(); + NOTREACHED() << "Unknown Event Type:" << native_event->type; break; } return ET_UNKNOWN; |