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

Unified Diff: ash/accelerators/magnifier_key_scroller.cc

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Rebase to ToT 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 | ash/ash.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/magnifier_key_scroller.cc
diff --git a/ash/accelerators/magnifier_key_scroller.cc b/ash/accelerators/magnifier_key_scroller.cc
index 709336ffaad941574af07bca9ee0fa40e4d84f99..c734e84bc4542ea82c6330739836569057dd4137 100644
--- a/ash/accelerators/magnifier_key_scroller.cc
+++ b/ash/accelerators/magnifier_key_scroller.cc
@@ -17,9 +17,13 @@ bool magnifier_key_scroller_enabled = false;
// static
bool MagnifierKeyScroller::IsEnabled() {
- return (magnifier_key_scroller_enabled ||
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kAshEnableMagnifierKeyScroller)) &&
+ bool has_switch = false;
+#if defined(OS_CHROMEOS)
+ has_switch = CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshEnableMagnifierKeyScroller);
+#endif
+
+ return (magnifier_key_scroller_enabled || has_switch) &&
ash::Shell::GetInstance()->magnification_controller()->IsEnabled();
}
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698