linux_aura: Call MapThemeImage for resources missing in native theme

chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc

Index: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc
index f45959e13995e26a97f649a0adc2fc604f0346fb..524dd3ed1d468daa61e9465df7f7848fadb611a5 100644
--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc
+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc
@@ -28,9 +28,13 @@ class DesktopThemeProvider : public ui::ThemeProvider {
     return delegate_->UsingSystemTheme();
   }
   gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
-    if (delegate_->UsingSystemTheme())
-      return delegate_->GetImageSkiaNamed(id);
-
+    if (delegate_->UsingSystemTheme()) {
+      if (delegate_->HasCustomImage(id))
+        return delegate_->GetImageSkiaNamed(id);
+      else
+        return delegate_->GetImageSkiaNamed(
+            chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));

[Elliot Glaysher, 2015/07/17 17:06:28]

nit: this return line looks duplicated. Prefer something like this instead:

if (delegate_->UsingSystemTheme() && delegate_->HasCustomImage(id))
    return delegate_->GetImageSkiaNamed(id);
return /* mapped case */;

[jclw, 2015/07/21 20:11:38]

Done.

+    }
     return delegate_->GetImageSkiaNamed(
         chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
   }