Index: ui/views/examples/scroll_view_example.cc |
diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc |
index 4fd1aaa2970948ed351eff7775a654532e9aa837..82b1ea488d50bf56c8026d99b789efcd49c9dfa4 100644 |
--- a/ui/views/examples/scroll_view_example.cc |
+++ b/ui/views/examples/scroll_view_example.cc |
@@ -23,7 +23,7 @@ namespace examples { |
class ScrollViewExample::ScrollableView : public View { |
public: |
ScrollableView() { |
- SetColor(SK_ColorRED, SK_ColorCYAN); |
+ SetColor(SK_ColorRED); |
AddChildView(new LabelButton(NULL, ASCIIToUTF16("Button"))); |
AddChildView(new RadioButton(ASCIIToUTF16("Radio Button"), 0)); |
} |
@@ -32,8 +32,8 @@ class ScrollViewExample::ScrollableView : public View { |
return gfx::Size(width(), height()); |
} |
- void SetColor(SkColor from, SkColor to) { |
- set_background(Background::CreateVerticalGradientBackground(from, to)); |
+ void SetColor(SkColor color) { |
+ set_background(Background::CreateSolidBackground(color)); |
} |
void PlaceChildY(int index, int y) { |
@@ -68,7 +68,7 @@ void ScrollViewExample::CreateExampleView(View* container) { |
scroll_view_ = new ScrollView(); |
scroll_view_->SetContents(scrollable_); |
scrollable_->SetBounds(0, 0, 1000, 100); |
- scrollable_->SetColor(SK_ColorYELLOW, SK_ColorCYAN); |
+ scrollable_->SetColor(SK_ColorYELLOW); |
GridLayout* layout = new GridLayout(container); |
container->SetLayoutManager(layout); |
@@ -97,16 +97,16 @@ void ScrollViewExample::CreateExampleView(View* container) { |
void ScrollViewExample::ButtonPressed(Button* sender, const ui::Event& event) { |
if (sender == wide_) { |
scrollable_->SetBounds(0, 0, 1000, 100); |
- scrollable_->SetColor(SK_ColorYELLOW, SK_ColorCYAN); |
+ scrollable_->SetColor(SK_ColorYELLOW); |
} else if (sender == tall_) { |
scrollable_->SetBounds(0, 0, 100, 1000); |
- scrollable_->SetColor(SK_ColorRED, SK_ColorCYAN); |
+ scrollable_->SetColor(SK_ColorRED); |
} else if (sender == big_square_) { |
scrollable_->SetBounds(0, 0, 1000, 1000); |
- scrollable_->SetColor(SK_ColorRED, SK_ColorGREEN); |
+ scrollable_->SetColor(SK_ColorCYAN); |
} else if (sender == small_square_) { |
scrollable_->SetBounds(0, 0, 100, 100); |
- scrollable_->SetColor(SK_ColorYELLOW, SK_ColorGREEN); |
+ scrollable_->SetColor(SK_ColorGREEN); |
} else if (sender == scroll_to_) { |
scroll_view_->contents()->ScrollRectToVisible( |
gfx::Rect(20, 500, 1000, 500)); |