Index: ash/magnifier/magnification_controller.cc |
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc |
index 811de5b73dc66d7a3c9ceafe2cc5b8cae80e6d19..1879fc3379ea219ec654108f451ed313bcaadef7 100644 |
--- a/ash/magnifier/magnification_controller.cc |
+++ b/ash/magnifier/magnification_controller.cc |
@@ -33,7 +33,6 @@ const float kScrollScaleChangeFactor = 0.05f; |
} // namespace |
namespace ash { |
-namespace internal { |
//////////////////////////////////////////////////////////////////////////////// |
// MagnificationControllerImpl: |
@@ -47,6 +46,7 @@ class MagnificationControllerImpl : virtual public MagnificationController, |
// MagnificationController overrides: |
virtual void SetEnabled(bool enabled) OVERRIDE; |
+ virtual bool IsEnabled() const OVERRIDE; |
virtual void SetScale(float scale, bool animate) OVERRIDE; |
virtual float GetScale() const OVERRIDE { return scale_; } |
virtual void MoveWindow(int x, int y, bool animate) OVERRIDE; |
@@ -448,6 +448,10 @@ void MagnificationControllerImpl::SetEnabled(bool enabled) { |
} |
} |
+bool MagnificationControllerImpl::IsEnabled() const { |
+ return is_enabled_; |
+} |
+ |
//////////////////////////////////////////////////////////////////////////////// |
// MagnificationControllerImpl: aura::EventFilter implementation |
@@ -508,5 +512,4 @@ MagnificationController* MagnificationController::CreateInstance() { |
return new MagnificationControllerImpl(); |
} |
-} // namespace internal |
} // namespace ash |