MacViews: views_examples_with_content_exe working!

ui/native_theme/native_theme_aura.cc

 // Copyright (c) 2012 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.
 
 #include "ui/native_theme/native_theme_aura.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 49 matching lines @@
 const int kScrollbarOverlayThumbStrokeImages[9] =
     IMAGE_GRID_NO_CENTER(IDR_SCROLLBAR_OVERLAY_THUMB_STROKE);
 
 const int kScrollbarOverlayThumbFillImages[9] =
     IMAGE_GRID(IDR_SCROLLBAR_OVERLAY_THUMB_FILL);
 
 const int kScrollbarTrackImages[9] = IMAGE_GRID(IDR_SCROLLBAR_BASE);
 
 }  // namespace
 
-#if !defined(OS_WIN)
+#if !defined(OS_WIN) && !defined(OS_MACOSX)
 // static
 NativeTheme* NativeTheme::instance() {
   return NativeThemeAura::instance();
 }
+#endif
 
+#if !defined(OS_WIN)
 // static
 NativeThemeAura* NativeThemeAura::instance() {
   CR_DEFINE_STATIC_LOCAL(NativeThemeAura, s_native_theme, ());
   return &s_native_theme;
 }
 #endif
 
 NativeThemeAura::NativeThemeAura() {
   // We don't draw scrollbar buttons.
 #if defined(OS_CHROMEOS)
@@ skipping 189 matching lines @@
     scoped_ptr<NineImagePainter> stroke_painter,
     const uint8 stroke_alphas[kMaxState])
     : fill_painter(fill_painter.Pass()),
       fill_alphas(fill_alphas),
       stroke_painter(stroke_painter.Pass()),
       stroke_alphas(stroke_alphas) {}
 
 NativeThemeAura::DualPainter::~DualPainter() {}
 
 }  // namespace ui