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

Unified Diff: ui/views/test/views_test_base.cc

Issue 1982963002: Reland: mus: Add views_mus_interactive_ui_tests target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix size_t to int warning on Windows Created 4 years, 7 months 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/test/views_test_base.h ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/views_test_base.cc
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
index 0222a0fa30bc34a7a0a1d54a0c28ead7d90b884c..239f74bca503a02b3f0fb0e57c97096e78249620 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -10,6 +10,7 @@
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/test/material_design_controller_test_api.h"
+#include "ui/views/test/platform_test_helper.h"
namespace views {
@@ -25,6 +26,11 @@ ViewsTestBase::~ViewsTestBase() {
<< "You have overridden TearDown but never called super class's TearDown";
}
+// static
+bool ViewsTestBase::IsMus() {
+ return PlatformTestHelper::IsMus();
+}
+
void ViewsTestBase::SetUp() {
testing::Test::SetUp();
// ContentTestSuiteBase might have already initialized
@@ -71,8 +77,4 @@ gfx::NativeWindow ViewsTestBase::GetContext() {
return test_helper_->GetContext();
}
-bool ViewsTestBase::IsMus() const {
- return test_helper_->IsMus();
-}
-
} // namespace views
« no previous file with comments | « ui/views/test/views_test_base.h ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698