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

Unified Diff: chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc

Issue 11550010: Remove partial magnifier from settings page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use a boolean pref instead of string pref. Created 8 years 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: chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
index 8a138d06205621e2aafa258ab4591d819c941355..ed453f0d56525ba3f9e2a831ed89ddba31a1994c 100644
--- a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
@@ -66,8 +66,8 @@ class MagnificationManagerTest : public CrosInProcessBrowserTest,
}
void SetScreenManagnifierTypeToPref(ash::MagnifierType type) {
- prefs()->SetString(prefs::kMagnifierType,
- accessibility::ScreenMagnifierNameFromType(type));
+ prefs()->SetBoolean(prefs::kScreenMagnifierEnabled,
+ (type != ash::MAGNIFIER_OFF) ? true : false);
}
void SetFullScreenMagnifierScale(double scale) {
@@ -326,13 +326,6 @@ IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, ChangingTypeInvokesObserver) {
EXPECT_EQ(observed_type_, ash::MAGNIFIER_FULL);
CheckCurrentMagnifierType(ash::MAGNIFIER_FULL);
- // Enables partial screen magnifier and confirms observer is invoked.
- observed_ = false;
- SetScreenManagnifierTypeToPref(ash::MAGNIFIER_PARTIAL);
- EXPECT_TRUE(observed_);
- EXPECT_EQ(observed_type_, ash::MAGNIFIER_PARTIAL);
- CheckCurrentMagnifierType(ash::MAGNIFIER_PARTIAL);
-
// Disables magnifier again and confirms observer is invoked.
observed_ = false;
SetScreenManagnifierTypeToPref(ash::MAGNIFIER_OFF);
« no previous file with comments | « chrome/browser/chromeos/accessibility/magnification_manager.cc ('k') | chrome/browser/chromeos/preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698