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

Side by Side Diff: content/browser/web_contents/aura/gesture_nav_simple.h

Issue 628213003: Replace OVERRIDE and FINAL with override and final in content/browser/web_contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/web_contents/aura/gesture_nav_simple.cc » ('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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/renderer_host/overscroll_controller_delegate.h" 9 #include "content/browser/renderer_host/overscroll_controller_delegate.h"
10 10
(...skipping 17 matching lines...) Expand all
28 explicit GestureNavSimple(WebContentsImpl* web_contents); 28 explicit GestureNavSimple(WebContentsImpl* web_contents);
29 virtual ~GestureNavSimple(); 29 virtual ~GestureNavSimple();
30 30
31 private: 31 private:
32 void ApplyEffectsAndDestroy(const gfx::Transform& transform, float opacity); 32 void ApplyEffectsAndDestroy(const gfx::Transform& transform, float opacity);
33 void AbortGestureAnimation(); 33 void AbortGestureAnimation();
34 void CompleteGestureAnimation(); 34 void CompleteGestureAnimation();
35 bool ApplyEffectsForDelta(float delta_x); 35 bool ApplyEffectsForDelta(float delta_x);
36 36
37 // OverscrollControllerDelegate: 37 // OverscrollControllerDelegate:
38 virtual gfx::Rect GetVisibleBounds() const OVERRIDE; 38 virtual gfx::Rect GetVisibleBounds() const override;
39 // Returns true if the scroll update was consumed. 39 // Returns true if the scroll update was consumed.
40 virtual bool OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE; 40 virtual bool OnOverscrollUpdate(float delta_x, float delta_y) override;
41 virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE; 41 virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) override;
42 virtual void OnOverscrollModeChange(OverscrollMode old_mode, 42 virtual void OnOverscrollModeChange(OverscrollMode old_mode,
43 OverscrollMode new_mode) OVERRIDE; 43 OverscrollMode new_mode) override;
44 44
45 WebContentsImpl* web_contents_; 45 WebContentsImpl* web_contents_;
46 scoped_ptr<ui::Layer> clip_layer_; 46 scoped_ptr<ui::Layer> clip_layer_;
47 scoped_ptr<ui::Layer> arrow_; 47 scoped_ptr<ui::Layer> arrow_;
48 scoped_ptr<ArrowLayerDelegate> arrow_delegate_; 48 scoped_ptr<ArrowLayerDelegate> arrow_delegate_;
49 float completion_threshold_; 49 float completion_threshold_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(GestureNavSimple); 51 DISALLOW_COPY_AND_ASSIGN(GestureNavSimple);
52 }; 52 };
53 53
54 } // namespace content 54 } // namespace content
55 55
56 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_ 56 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/web_contents/aura/gesture_nav_simple.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698