| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/view.h" | 5 #include "ui/views/view.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 4541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4552 | 4552 |
| 4553 // ui::NativeTheme: | 4553 // ui::NativeTheme: |
| 4554 SkColor GetSystemColor(ColorId color_id) const override { | 4554 SkColor GetSystemColor(ColorId color_id) const override { |
| 4555 return SK_ColorRED; | 4555 return SK_ColorRED; |
| 4556 } | 4556 } |
| 4557 gfx::Size GetPartSize(Part part, | 4557 gfx::Size GetPartSize(Part part, |
| 4558 State state, | 4558 State state, |
| 4559 const ExtraParams& extra) const override { | 4559 const ExtraParams& extra) const override { |
| 4560 return gfx::Size(); | 4560 return gfx::Size(); |
| 4561 } | 4561 } |
| 4562 void Paint(SkCanvas* canvas, | 4562 void Paint(cc::PaintCanvas* canvas, |
| 4563 Part part, | 4563 Part part, |
| 4564 State state, | 4564 State state, |
| 4565 const gfx::Rect& rect, | 4565 const gfx::Rect& rect, |
| 4566 const ExtraParams& extra) const override {} | 4566 const ExtraParams& extra) const override {} |
| 4567 | 4567 |
| 4568 private: | 4568 private: |
| 4569 DISALLOW_COPY_AND_ASSIGN(TestNativeTheme); | 4569 DISALLOW_COPY_AND_ASSIGN(TestNativeTheme); |
| 4570 }; | 4570 }; |
| 4571 | 4571 |
| 4572 // Creates and adds a new child view to |parent| that has a layer. | 4572 // Creates and adds a new child view to |parent| that has a layer. |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4862 std::unique_ptr<View> view = NewView(); | 4862 std::unique_ptr<View> view = NewView(); |
| 4863 std::unique_ptr<View> child_view = NewView(); | 4863 std::unique_ptr<View> child_view = NewView(); |
| 4864 std::unique_ptr<View> child_view2 = NewView(); | 4864 std::unique_ptr<View> child_view2 = NewView(); |
| 4865 view->AddChildView(child_view.get()); | 4865 view->AddChildView(child_view.get()); |
| 4866 view->AddChildView(child_view2.get()); | 4866 view->AddChildView(child_view2.get()); |
| 4867 view->ReorderChildView(child_view2.get(), 0); | 4867 view->ReorderChildView(child_view2.get(), 0); |
| 4868 EXPECT_EQ(child_view2.get(), view_reordered()); | 4868 EXPECT_EQ(child_view2.get(), view_reordered()); |
| 4869 } | 4869 } |
| 4870 | 4870 |
| 4871 } // namespace views | 4871 } // namespace views |
| OLD | NEW |