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

Unified Diff: trunk/src/ash/accelerators/magnifier_key_scroller.cc

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « no previous file | trunk/src/ash/ash.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/accelerators/magnifier_key_scroller.cc
===================================================================
--- trunk/src/ash/accelerators/magnifier_key_scroller.cc (revision 269901)
+++ trunk/src/ash/accelerators/magnifier_key_scroller.cc (working copy)
@@ -17,13 +17,9 @@
// static
bool MagnifierKeyScroller::IsEnabled() {
- bool has_switch = false;
-#if defined(OS_CHROMEOS)
- has_switch = CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kAshEnableMagnifierKeyScroller);
-#endif
-
- return (magnifier_key_scroller_enabled || has_switch) &&
+ return (magnifier_key_scroller_enabled ||
+ CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshEnableMagnifierKeyScroller)) &&
ash::Shell::GetInstance()->magnification_controller()->IsEnabled();
}
« no previous file with comments | « no previous file | trunk/src/ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698