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

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash41_scroll_end_effect
Patch Set: Created 6 years, 2 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/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 1b6f1faddf9022cc5bd8527ac3d28c6e01ec1e54..384a8e5c9ba739081852fd4525207fd45019075d 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -159,13 +159,13 @@ bool HandleMagnifyScreen(int delta_index) {
float scale =
ash::Shell::GetInstance()->magnification_controller()->GetScale();
// Calculate rounded logarithm (base kMagnificationScaleFactor) of scale.
- int scale_index =
- std::floor(std::log(scale) / std::log(kMagnificationScaleFactor) + 0.5);
+ int scale_index = std::floor(
+ std::log(scale) / std::log(ui::kMagnificationScaleFactor) + 0.5);
int new_scale_index = std::max(0, std::min(8, scale_index + delta_index));
- ash::Shell::GetInstance()->magnification_controller()->
- SetScale(std::pow(kMagnificationScaleFactor, new_scale_index), true);
+ ash::Shell::GetInstance()->magnification_controller()->SetScale(
+ std::pow(ui::kMagnificationScaleFactor, new_scale_index), true);
return true;
} else if (ash::Shell::GetInstance()->
partial_magnification_controller()->is_enabled()) {
@@ -573,7 +573,7 @@ bool HandleToggleSpokenFeedback() {
base::RecordAction(UserMetricsAction("Accel_Toggle_Spoken_Feedback"));
Shell::GetInstance()->accessibility_delegate()->
- ToggleSpokenFeedback(A11Y_NOTIFICATION_SHOW);
+ ToggleSpokenFeedback(ui::A11Y_NOTIFICATION_SHOW);
return true;
}
@@ -1058,7 +1058,7 @@ AcceleratorController::GetAcceleratorProcessingRestriction(int action) {
if (MruWindowTracker::BuildWindowList(false).empty() &&
actions_needing_window_.find(action) != actions_needing_window_.end()) {
Shell::GetInstance()->accessibility_delegate()->TriggerAccessibilityAlert(
- A11Y_ALERT_WINDOW_NEEDED);
+ ui::A11Y_ALERT_WINDOW_NEEDED);
return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION;
}
return RESTRICTION_NONE;
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698