Change name of NativeTheme::instance() to make it clear it's web only.

ui/views/controls/combobox/combobox.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/views/controls/combobox/combobox.h"
 
 #include "base/logging.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/models/combobox_model_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
+#include "ui/native_theme/native_theme_aura.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/prefix_selector.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/mouse_constants.h"
@@ skipping 852 matching lines @@
   }
   NOTREACHED();
   return 0;
 }
 
 gfx::Size Combobox::ArrowSize() const {
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // TODO(estade): hack alert! This should always use GetNativeTheme(). For now
   // STYLE_ACTION isn't properly themed so we have to override the NativeTheme
   // behavior. See crbug.com/384071
-  const ui::NativeTheme* native_theme_for_arrow = style_ == STYLE_ACTION ?
-      ui::NativeTheme::instance() :
-      GetNativeTheme();
+  const ui::NativeTheme* native_theme_for_arrow =
+      style_ == STYLE_ACTION ? ui::NativeThemeAura::instance()
+                             : GetNativeTheme();
 #else
   const ui::NativeTheme* native_theme_for_arrow = GetNativeTheme();
 #endif
 
   ui::NativeTheme::ExtraParams ignored;
   return native_theme_for_arrow->GetPartSize(ui::NativeTheme::kComboboxArrow,
                                              ui::NativeTheme::kNormal,
                                              ignored);
 }
 
@@ skipping 14 matching lines @@
   return gfx::Size(width, font_list.GetHeight());
 }
 
 PrefixSelector* Combobox::GetPrefixSelector() {
   if (!selector_)
     selector_.reset(new PrefixSelector(this));
   return selector_.get();
 }
 
 }  // namespace views