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

Side by Side Diff: content/browser/web_contents/aura/overscroll_navigation_overlay.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
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_OVERSCROLL_NAVIGATION_OVERLAY_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "content/browser/web_contents/aura/window_slider.h" 10 #include "content/browser/web_contents/aura/window_slider.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 // Stop observing the page and start the final overlay fade-out animation if 70 // Stop observing the page and start the final overlay fade-out animation if
71 // a window-slide isn't in progress and either the page has been painted or 71 // a window-slide isn't in progress and either the page has been painted or
72 // the page-load has completed. 72 // the page-load has completed.
73 void StopObservingIfDone(); 73 void StopObservingIfDone();
74 74
75 // Creates a layer to be used for window-slide. |offset| is the offset of the 75 // Creates a layer to be used for window-slide. |offset| is the offset of the
76 // NavigationEntry for the screenshot image to display. 76 // NavigationEntry for the screenshot image to display.
77 ui::Layer* CreateSlideLayer(int offset); 77 ui::Layer* CreateSlideLayer(int offset);
78 78
79 // Overridden from WindowSlider::Delegate: 79 // Overridden from WindowSlider::Delegate:
80 virtual ui::Layer* CreateBackLayer() OVERRIDE; 80 virtual ui::Layer* CreateBackLayer() override;
81 virtual ui::Layer* CreateFrontLayer() OVERRIDE; 81 virtual ui::Layer* CreateFrontLayer() override;
82 virtual void OnWindowSlideCompleting() OVERRIDE; 82 virtual void OnWindowSlideCompleting() override;
83 virtual void OnWindowSlideCompleted(scoped_ptr<ui::Layer> layer) OVERRIDE; 83 virtual void OnWindowSlideCompleted(scoped_ptr<ui::Layer> layer) override;
84 virtual void OnWindowSlideAborted() OVERRIDE; 84 virtual void OnWindowSlideAborted() override;
85 virtual void OnWindowSliderDestroyed() OVERRIDE; 85 virtual void OnWindowSliderDestroyed() override;
86 86
87 // Overridden from WebContentsObserver: 87 // Overridden from WebContentsObserver:
88 virtual void DidFirstVisuallyNonEmptyPaint() OVERRIDE; 88 virtual void DidFirstVisuallyNonEmptyPaint() override;
89 virtual void DidStopLoading(RenderViewHost* host) OVERRIDE; 89 virtual void DidStopLoading(RenderViewHost* host) override;
90 90
91 // The WebContents which is being navigated. 91 // The WebContents which is being navigated.
92 WebContentsImpl* web_contents_; 92 WebContentsImpl* web_contents_;
93 93
94 // The screenshot overlay window. 94 // The screenshot overlay window.
95 scoped_ptr<aura::Window> window_; 95 scoped_ptr<aura::Window> window_;
96 96
97 // This is the WindowDelegate of |window_|. The delegate manages its own 97 // This is the WindowDelegate of |window_|. The delegate manages its own
98 // lifetime (destroys itself when |window_| is destroyed). 98 // lifetime (destroys itself when |window_| is destroyed).
99 ImageWindowDelegate* image_delegate_; 99 ImageWindowDelegate* image_delegate_;
(...skipping 19 matching lines...) Expand all
119 119
120 // The LayerDelegate used for the back/front layers during a slide. 120 // The LayerDelegate used for the back/front layers during a slide.
121 scoped_ptr<ImageLayerDelegate> layer_delegate_; 121 scoped_ptr<ImageLayerDelegate> layer_delegate_;
122 122
123 DISALLOW_COPY_AND_ASSIGN(OverscrollNavigationOverlay); 123 DISALLOW_COPY_AND_ASSIGN(OverscrollNavigationOverlay);
124 }; 124 };
125 125
126 } // namespace content 126 } // namespace content
127 127
128 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ 128 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698