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

Unified Diff: ui/base/layout_unittest.cc

Issue 11301007: Load the resources for max scale factor first. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: do this only for chromeos for now Created 8 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
Index: ui/base/layout_unittest.cc
diff --git a/ui/base/layout_unittest.cc b/ui/base/layout_unittest.cc
index 4878e12529cc247e14ab0afd53d98c7d676c9b08..302e5d2dc125f5b7256d5878f196fdadb4264f84 100644
--- a/ui/base/layout_unittest.cc
+++ b/ui/base/layout_unittest.cc
@@ -78,7 +78,7 @@ TEST(LayoutTest, GetMaxScaleFactor) {
!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kForceDeviceScaleFactor))
EXPECT_EQ(SCALE_FACTOR_100P, GetMaxScaleFactor());
-#else
+#endif
{
ScaleFactor scale_factors[] = { SCALE_FACTOR_100P };
std::vector<ScaleFactor> supported_factors(
@@ -106,7 +106,6 @@ TEST(LayoutTest, GetMaxScaleFactor) {
test::SetSupportedScaleFactors(supported_factors);
EXPECT_EQ(SCALE_FACTOR_200P, GetMaxScaleFactor());
}
-#endif
}
} // namespace ui
« ui/base/layout.h ('K') | « ui/base/layout.cc ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698