Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: ui/views/controls/scroll_view_unittest.cc

Issue 2480763005: Remove NativeScrollBar*. (Closed)
Patch Set: GetHorizontalSrollBarHeight Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/BUILD.gn ('k') | ui/views/controls/scrollbar/base_scroll_bar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/scroll_view_unittest.cc
diff --git a/ui/views/controls/scroll_view_unittest.cc b/ui/views/controls/scroll_view_unittest.cc
index 23f2c5f4fdaeb42f2e5ddea5b4599b7131383012..9007c540b5881641d65803779fc48b7b72cdd2de 100644
--- a/ui/views/controls/scroll_view_unittest.cc
+++ b/ui/views/controls/scroll_view_unittest.cc
@@ -11,9 +11,8 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/views/border.h"
#include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h"
-#include "ui/views/controls/scrollbar/native_scroll_bar.h"
-#include "ui/views/controls/scrollbar/native_scroll_bar_views.h"
#include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
+#include "ui/views/controls/scrollbar/scroll_bar_views.h"
#include "ui/views/test/test_views.h"
#include "ui/views/test/widget_test.h"
@@ -34,10 +33,6 @@ class ScrollViewTestApi {
BaseScrollBar* GetBaseScrollBar(ScrollBarOrientation orientation) {
ScrollBar* scroll_bar = orientation == VERTICAL ? scroll_view_->vert_sb_
: scroll_view_->horiz_sb_;
- if (scroll_bar->GetClassName() == NativeScrollBar::kViewClassName) {
- return static_cast<NativeScrollBarViews*>(
- static_cast<NativeScrollBar*>(scroll_bar)->native_wrapper_);
- }
return static_cast<BaseScrollBar*>(scroll_bar);
}
« no previous file with comments | « ui/views/BUILD.gn ('k') | ui/views/controls/scrollbar/base_scroll_bar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698