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

Unified Diff: chrome/browser/ui/ash/ash_init.cc

Issue 11821053: Revert 176087 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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
Index: chrome/browser/ui/ash/ash_init.cc
===================================================================
--- chrome/browser/ui/ash/ash_init.cc (revision 176100)
+++ chrome/browser/ui/ash/ash_init.cc (working copy)
@@ -96,14 +96,12 @@
chromeos::accessibility::IsHighContrastEnabled());
DCHECK(chromeos::MagnificationManager::Get());
- bool magnifier_enabled =
- chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
ash::MagnifierType magnifier_type =
chromeos::MagnificationManager::Get()->GetMagnifierType();
- ash::Shell::GetInstance()->magnification_controller()->
- SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL);
- ash::Shell::GetInstance()->partial_magnification_controller()->
- SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL);
+ ash::Shell::GetInstance()->magnification_controller()->SetEnabled(
+ magnifier_type == ash::MAGNIFIER_FULL);
+ ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled(
+ magnifier_type == ash::MAGNIFIER_PARTIAL);
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableZeroBrowsersOpenForTests)) {
« no previous file with comments | « chrome/browser/resources/options/browser_options.html ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698