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

Side by Side Diff: ash/display/cursor_window_controller.cc

Issue 685543003: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | ash/display/display_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/display/cursor_window_controller.h" 5 #include "ash/display/cursor_window_controller.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/mirror_window_controller.h" 8 #include "ash/display/mirror_window_controller.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/shell_window_ids.h" 11 #include "ash/shell_window_ids.h"
12 #include "ui/aura/env.h" 12 #include "ui/aura/env.h"
13 #include "ui/aura/window_delegate.h" 13 #include "ui/aura/window_delegate.h"
14 #include "ui/aura/window_event_dispatcher.h" 14 #include "ui/aura/window_event_dispatcher.h"
15 #include "ui/base/cursor/cursors_aura.h" 15 #include "ui/base/cursor/cursors_aura.h"
16 #include "ui/base/hit_test.h" 16 #include "ui/base/hit_test.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/compositor/dip_util.h" 18 #include "ui/compositor/dip_util.h"
19 #include "ui/gfx/canvas.h" 19 #include "ui/gfx/canvas.h"
20 #include "ui/gfx/display.h" 20 #include "ui/gfx/display.h"
21 #include "ui/gfx/image/image_skia.h" 21 #include "ui/gfx/image/image_skia.h"
22 #include "ui/gfx/image/image_skia_operations.h" 22 #include "ui/gfx/image/image_skia_operations.h"
23 23
24 namespace ash { 24 namespace ash {
25 25
26 class CursorWindowDelegate : public aura::WindowDelegate { 26 class CursorWindowDelegate : public aura::WindowDelegate {
27 public: 27 public:
28 CursorWindowDelegate() : is_cursor_compositing_enabled_(false) {} 28 CursorWindowDelegate() : is_cursor_compositing_enabled_(false) {}
29 virtual ~CursorWindowDelegate() {} 29 ~CursorWindowDelegate() override {}
30 30
31 // aura::WindowDelegate overrides: 31 // aura::WindowDelegate overrides:
32 virtual gfx::Size GetMinimumSize() const override { return size_; } 32 gfx::Size GetMinimumSize() const override { return size_; }
33 virtual gfx::Size GetMaximumSize() const override { return size_; } 33 gfx::Size GetMaximumSize() const override { return size_; }
34 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 34 void OnBoundsChanged(const gfx::Rect& old_bounds,
35 const gfx::Rect& new_bounds) override {} 35 const gfx::Rect& new_bounds) override {}
36 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override { 36 gfx::NativeCursor GetCursor(const gfx::Point& point) override {
37 return gfx::kNullCursor; 37 return gfx::kNullCursor;
38 } 38 }
39 virtual int GetNonClientComponent( 39 int GetNonClientComponent(const gfx::Point& point) const override {
40 const gfx::Point& point) const override {
41 return HTNOWHERE; 40 return HTNOWHERE;
42 } 41 }
43 virtual bool ShouldDescendIntoChildForEventHandling( 42 bool ShouldDescendIntoChildForEventHandling(
44 aura::Window* child, 43 aura::Window* child,
45 const gfx::Point& location) override { 44 const gfx::Point& location) override {
46 return false; 45 return false;
47 } 46 }
48 virtual bool CanFocus() override { return false; } 47 bool CanFocus() override { return false; }
49 virtual void OnCaptureLost() override {} 48 void OnCaptureLost() override {}
50 virtual void OnPaint(gfx::Canvas* canvas) override { 49 void OnPaint(gfx::Canvas* canvas) override {
51 canvas->DrawImageInt(cursor_image_, 0, 0); 50 canvas->DrawImageInt(cursor_image_, 0, 0);
52 } 51 }
53 virtual void OnDeviceScaleFactorChanged( 52 void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
54 float device_scale_factor) override {} 53 void OnWindowDestroying(aura::Window* window) override {}
55 virtual void OnWindowDestroying(aura::Window* window) override {} 54 void OnWindowDestroyed(aura::Window* window) override {}
56 virtual void OnWindowDestroyed(aura::Window* window) override {} 55 void OnWindowTargetVisibilityChanged(bool visible) override {}
57 virtual void OnWindowTargetVisibilityChanged(bool visible) override {} 56 bool HasHitTestMask() const override { return false; }
58 virtual bool HasHitTestMask() const override { return false; } 57 void GetHitTestMask(gfx::Path* mask) const override {}
59 virtual void GetHitTestMask(gfx::Path* mask) const override {}
60 58
61 // Sets cursor compositing mode on/off. 59 // Sets cursor compositing mode on/off.
62 void SetCursorCompositingEnabled(bool enabled) { 60 void SetCursorCompositingEnabled(bool enabled) {
63 is_cursor_compositing_enabled_ = enabled; 61 is_cursor_compositing_enabled_ = enabled;
64 } 62 }
65 63
66 // Sets the cursor image for the |display|'s scale factor. 64 // Sets the cursor image for the |display|'s scale factor.
67 void SetCursorImage(const gfx::ImageSkia& image, 65 void SetCursorImage(const gfx::ImageSkia& image,
68 const gfx::Display& display) { 66 const gfx::Display& display) {
69 float scale_factor = display.device_scale_factor(); 67 float scale_factor = display.device_scale_factor();
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 delegate_->SetCursorImage(rotated, display_); 256 delegate_->SetCursorImage(rotated, display_);
259 if (cursor_window_) { 257 if (cursor_window_) {
260 cursor_window_->SetBounds(gfx::Rect(delegate_->size())); 258 cursor_window_->SetBounds(gfx::Rect(delegate_->size()));
261 cursor_window_->SchedulePaintInRect( 259 cursor_window_->SchedulePaintInRect(
262 gfx::Rect(cursor_window_->bounds().size())); 260 gfx::Rect(cursor_window_->bounds().size()));
263 UpdateLocation(); 261 UpdateLocation();
264 } 262 }
265 } 263 }
266 264
267 } // namespace ash 265 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698