Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / scroll_view.cc

diff --git a/src/ui/views/controls/scroll_view.cc b/src/ui/views/controls/scroll_view.cc
index 297be03..e20f396 100644 (file)
--- a/src/ui/views/controls/scroll_view.cc
+++ b/src/ui/views/controls/scroll_view.cc
@@ -20,23 +20,16 @@ namespace {
 // Subclass of ScrollView that resets the border when the theme changes.
 class ScrollViewWithBorder : public views::ScrollView {
  public:
-  ScrollViewWithBorder() {
-    SetThemeSpecificState();
-  }
+  ScrollViewWithBorder() {}
 
   // View overrides;
   virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE {
-    SetThemeSpecificState();
-  }
-
- private:
-  void SetThemeSpecificState() {
     SetBorder(Border::CreateSolidBorder(
         1,
-        GetNativeTheme()->GetSystemColor(
-            ui::NativeTheme::kColorId_UnfocusedBorderColor)));
+        theme->GetSystemColor(ui::NativeTheme::kColorId_UnfocusedBorderColor)));
   }
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(ScrollViewWithBorder);
 };