Split NativeThemeAura into Overlay and NonOverlay versions.

ui/native_theme/native_theme_aura_overlay.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.
 
-#ifndef UI_NATIVE_THEME_NATIVE_THEME_AURA_H_
-#define UI_NATIVE_THEME_NATIVE_THEME_AURA_H_
+#ifndef UI_NATIVE_THEME_NATIVE_THEME_AURA_OVERLAY_H_
+#define UI_NATIVE_THEME_NATIVE_THEME_AURA_OVERLAY_H_
 
 #include "base/macros.h"
+#include "ui/native_theme/native_theme_aura.h"
 #include "ui/native_theme/native_theme_base.h"
 
 namespace ui {
 
 // Aura implementation of native theme support.
-class NATIVE_THEME_EXPORT NativeThemeAura : public NativeThemeBase {
+class NATIVE_THEME_EXPORT NativeThemeAuraOverlay : public NativeThemeAura {
  public:
-  static NativeThemeAura* instance();
+  static NativeThemeAuraOverlay* instance();
 
  protected:
-  NativeThemeAura();
-  ~NativeThemeAura() override;
+  NativeThemeAuraOverlay();
+  ~NativeThemeAuraOverlay() override;
 
-  // Overridden from NativeThemeBase:
-  SkColor GetSystemColor(ColorId color_id) const override;
-  void PaintMenuPopupBackground(
-      SkCanvas* canvas,
-      const gfx::Size& size,
-      const MenuBackgroundExtraParams& menu_background) const override;
-  void PaintMenuItemBackground(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const MenuItemExtraParams& menu_item) const override;
-  void PaintArrowButton(SkCanvas* gc,
-                        const gfx::Rect& rect,
-                        Part direction,
-                        State state) const override;
+  // Overridden from NativeThemeAura:
   void PaintScrollbarTrack(SkCanvas* canvas,
                            Part part,
                            State state,
                            const ScrollbarTrackExtraParams& extra_params,
                            const gfx::Rect& rect) const override;
   void PaintScrollbarThumb(SkCanvas* canvas,
                            Part part,
                            State state,
                            const gfx::Rect& rect,
                            ScrollbarOverlayColorTheme theme) const override;
   void PaintScrollbarCorner(SkCanvas* canvas,
                             State state,
                             const gfx::Rect& rect) const override;
   gfx::Size GetPartSize(Part part,
                         State state,
                         const ExtraParams& extra) const override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(NativeThemeAura);
+  DISALLOW_COPY_AND_ASSIGN(NativeThemeAuraOverlay);
 };
 
 }  // namespace ui
 
-#endif  // UI_NATIVE_THEME_NATIVE_THEME_AURA_H_
+#endif  // UI_NATIVE_THEME_NATIVE_THEME_AURA_OVERLAY_H_
+