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

Side by Side Diff: ash/magnifier/magnification_controller.cc

Issue 11194011: Reverting this CL because it was committed before I gave the final LGTM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/magnifier/magnification_controller.h" 5 #include "ash/magnifier/magnification_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "ui/aura/client/cursor_client.h" 10 #include "ui/aura/client/cursor_client.h"
(...skipping 30 matching lines...) Expand all
41 41
42 class MagnificationControllerImpl : virtual public MagnificationController, 42 class MagnificationControllerImpl : virtual public MagnificationController,
43 public aura::EventFilter, 43 public aura::EventFilter,
44 public ui::ImplicitAnimationObserver { 44 public ui::ImplicitAnimationObserver {
45 public: 45 public:
46 MagnificationControllerImpl(); 46 MagnificationControllerImpl();
47 virtual ~MagnificationControllerImpl(); 47 virtual ~MagnificationControllerImpl();
48 48
49 // MagnificationController overrides: 49 // MagnificationController overrides:
50 virtual void SetEnabled(bool enabled) OVERRIDE; 50 virtual void SetEnabled(bool enabled) OVERRIDE;
51 virtual bool IsEnabled() OVERRIDE { return is_enabled_; }
52 virtual void SetScale(float scale, bool animate) OVERRIDE; 51 virtual void SetScale(float scale, bool animate) OVERRIDE;
53 virtual float GetScale() const OVERRIDE { return scale_; } 52 virtual float GetScale() const OVERRIDE { return scale_; }
54 virtual void MoveWindow(int x, int y, bool animate) OVERRIDE; 53 virtual void MoveWindow(int x, int y, bool animate) OVERRIDE;
55 virtual void MoveWindow(const gfx::Point& point, bool animate) OVERRIDE; 54 virtual void MoveWindow(const gfx::Point& point, bool animate) OVERRIDE;
56 virtual gfx::Point GetWindowPosition() const OVERRIDE { return origin_; } 55 virtual gfx::Point GetWindowPosition() const OVERRIDE { return origin_; }
57 virtual void EnsureRectIsVisible(const gfx::Rect& rect, 56 virtual void EnsureRectIsVisible(const gfx::Rect& rect,
58 bool animate) OVERRIDE; 57 bool animate) OVERRIDE;
59 virtual void EnsurePointIsVisible(const gfx::Point& point, 58 virtual void EnsurePointIsVisible(const gfx::Point& point,
60 bool animate) OVERRIDE; 59 bool animate) OVERRIDE;
61 60
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 //////////////////////////////////////////////////////////////////////////////// 499 ////////////////////////////////////////////////////////////////////////////////
501 // MagnificationController: 500 // MagnificationController:
502 501
503 // static 502 // static
504 MagnificationController* MagnificationController::CreateInstance() { 503 MagnificationController* MagnificationController::CreateInstance() {
505 return new MagnificationControllerImpl(); 504 return new MagnificationControllerImpl();
506 } 505 }
507 506
508 } // namespace internal 507 } // namespace internal
509 } // namespace ash 508 } // namespace ash
OLDNEW
« no previous file with comments | « ash/magnifier/magnification_controller.h ('k') | chrome/browser/chromeos/accessibility/accessibility_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698