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

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: 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..0bff818c4418a00f9ecd27a6666f9bc2c225dd44 100644
--- a/ui/base/layout_unittest.cc
+++ b/ui/base/layout_unittest.cc
@@ -72,12 +72,10 @@ TEST(LayoutTest, GetScaleFactorFromScaleAllSupported) {
TEST(LayoutTest, GetMaxScaleFactor) {
#if defined(OS_CHROMEOS)
- // On Chrome OS, the maximum scale factor differs depending on the devices and
- // force-device-scale-factor flag. Tests only the cases not affected by these.
- if (!base::chromeos::IsRunningOnChromeOS() &&
- !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kForceDeviceScaleFactor))
- EXPECT_EQ(SCALE_FACTOR_100P, GetMaxScaleFactor());
+ // On Chrome OS, the maximum scale factor is based on
+ // the available resource pack. In testing environment,
+ // we always have 200P.
+ EXPECT_EQ(SCALE_FACTOR_200P, GetMaxScaleFactor());
#else
{
ScaleFactor scale_factors[] = { SCALE_FACTOR_100P };
« ui/base/layout.cc ('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