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

Side by Side Diff: content/browser/android/edge_effect_l.h

Issue 629183002: Replacing the OVERRIDE with override and FINAL with final in content/browser/android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolving Error in android 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 unified diff | Download patch
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 #ifndef CONTENT_BROWSER_ANDROID_EDGE_EFFECT_L_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_EDGE_EFFECT_L_H_
6 #define CONTENT_BROWSER_ANDROID_EDGE_EFFECT_L_H_ 6 #define CONTENT_BROWSER_ANDROID_EDGE_EFFECT_L_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/browser/android/edge_effect_base.h" 10 #include "content/browser/android/edge_effect_base.h"
(...skipping 15 matching lines...) Expand all
26 // Conscious tradeoffs were made to align this as closely as possible with the 26 // Conscious tradeoffs were made to align this as closely as possible with the
27 // the original Android java version. 27 // the original Android java version.
28 // All coordinates and dimensions are in device pixels. 28 // All coordinates and dimensions are in device pixels.
29 class EdgeEffectL : public EdgeEffectBase { 29 class EdgeEffectL : public EdgeEffectBase {
30 public: 30 public:
31 explicit EdgeEffectL(ui::SystemUIResourceManager* resource_manager); 31 explicit EdgeEffectL(ui::SystemUIResourceManager* resource_manager);
32 virtual ~EdgeEffectL(); 32 virtual ~EdgeEffectL();
33 33
34 virtual void Pull(base::TimeTicks current_time, 34 virtual void Pull(base::TimeTicks current_time,
35 float delta_distance, 35 float delta_distance,
36 float displacement) OVERRIDE; 36 float displacement) override;
37 virtual void Absorb(base::TimeTicks current_time, float velocity) OVERRIDE; 37 virtual void Absorb(base::TimeTicks current_time, float velocity) override;
38 virtual bool Update(base::TimeTicks current_time) OVERRIDE; 38 virtual bool Update(base::TimeTicks current_time) override;
39 virtual void Release(base::TimeTicks current_time) OVERRIDE; 39 virtual void Release(base::TimeTicks current_time) override;
40 40
41 virtual void Finish() OVERRIDE; 41 virtual void Finish() override;
42 virtual bool IsFinished() const OVERRIDE; 42 virtual bool IsFinished() const override;
43 43
44 virtual void ApplyToLayers(const gfx::SizeF& size, 44 virtual void ApplyToLayers(const gfx::SizeF& size,
45 const gfx::Transform& transform) OVERRIDE; 45 const gfx::Transform& transform) override;
46 virtual void SetParent(cc::Layer* parent) OVERRIDE; 46 virtual void SetParent(cc::Layer* parent) override;
47 47
48 // Thread-safe trigger to load resources. 48 // Thread-safe trigger to load resources.
49 static void PreloadResources(ui::SystemUIResourceManager* resource_manager); 49 static void PreloadResources(ui::SystemUIResourceManager* resource_manager);
50 50
51 private: 51 private:
52 ui::SystemUIResourceManager* const resource_manager_; 52 ui::SystemUIResourceManager* const resource_manager_;
53 53
54 scoped_refptr<cc::UIResourceLayer> glow_; 54 scoped_refptr<cc::UIResourceLayer> glow_;
55 55
56 float glow_alpha_; 56 float glow_alpha_;
(...skipping 15 matching lines...) Expand all
72 State state_; 72 State state_;
73 73
74 float pull_distance_; 74 float pull_distance_;
75 75
76 DISALLOW_COPY_AND_ASSIGN(EdgeEffectL); 76 DISALLOW_COPY_AND_ASSIGN(EdgeEffectL);
77 }; 77 };
78 78
79 } // namespace content 79 } // namespace content
80 80
81 #endif // CONTENT_BROWSER_ANDROID_EDGE_EFFECT_L_H_ 81 #endif // CONTENT_BROWSER_ANDROID_EDGE_EFFECT_L_H_
OLDNEW
« no previous file with comments | « content/browser/android/edge_effect.h ('k') | content/browser/android/in_process/synchronous_compositor_factory_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698