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

Side by Side Diff: ash/wm/overview/scoped_window_copy.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 | « ash/wm/overlay_event_filter.h ('k') | ash/wm/overview/transparent_activate_window_button.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/wm/overview/scoped_window_copy.h" 5 #include "ash/wm/overview/scoped_window_copy.h"
6 6
7 #include "ash/screen_util.h" 7 #include "ash/screen_util.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ui/aura/client/aura_constants.h" 9 #include "ui/aura/client/aura_constants.h"
10 #include "ui/aura/client/screen_position_client.h" 10 #include "ui/aura/client/screen_position_client.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 CleanupWidgetAfterAnimationObserver( 84 CleanupWidgetAfterAnimationObserver(
85 views::Widget* widget, 85 views::Widget* widget,
86 scoped_ptr<ui::LayerTreeOwner> layer_owner); 86 scoped_ptr<ui::LayerTreeOwner> layer_owner);
87 87
88 // Takes ownership of the widget. At this point the class will delete itself 88 // Takes ownership of the widget. At this point the class will delete itself
89 // and clean up the layer when there are no pending animations. 89 // and clean up the layer when there are no pending animations.
90 void TakeOwnershipOfWidget(); 90 void TakeOwnershipOfWidget();
91 91
92 // ui::LayerAnimationObserver: 92 // ui::LayerAnimationObserver:
93 virtual void OnLayerAnimationEnded( 93 virtual void OnLayerAnimationEnded(
94 ui::LayerAnimationSequence* sequence) OVERRIDE; 94 ui::LayerAnimationSequence* sequence) override;
95 virtual void OnLayerAnimationAborted( 95 virtual void OnLayerAnimationAborted(
96 ui::LayerAnimationSequence* sequence) OVERRIDE; 96 ui::LayerAnimationSequence* sequence) override;
97 virtual void OnLayerAnimationScheduled( 97 virtual void OnLayerAnimationScheduled(
98 ui::LayerAnimationSequence* sequence) OVERRIDE; 98 ui::LayerAnimationSequence* sequence) override;
99 99
100 private: 100 private:
101 virtual ~CleanupWidgetAfterAnimationObserver(); 101 virtual ~CleanupWidgetAfterAnimationObserver();
102 102
103 // If the necessary conditions have been satisfied to destruct this 103 // If the necessary conditions have been satisfied to destruct this
104 // class, deletes itself and cleans up the widget and layer. 104 // class, deletes itself and cleans up the widget and layer.
105 void MaybeDestruct(); 105 void MaybeDestruct();
106 106
107 views::Widget* widget_; 107 views::Widget* widget_;
108 scoped_ptr<ui::LayerTreeOwner> layer_owner_; 108 scoped_ptr<ui::LayerTreeOwner> layer_owner_;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 // The cleanup observer will delete itself and the window when any pending 169 // The cleanup observer will delete itself and the window when any pending
170 // animations have completed. 170 // animations have completed.
171 cleanup_observer_->TakeOwnershipOfWidget(); 171 cleanup_observer_->TakeOwnershipOfWidget();
172 } 172 }
173 173
174 aura::Window* ScopedWindowCopy::GetWindow() { 174 aura::Window* ScopedWindowCopy::GetWindow() {
175 return widget_->GetNativeWindow(); 175 return widget_->GetNativeWindow();
176 } 176 }
177 177
178 } // namespace ash 178 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/overlay_event_filter.h ('k') | ash/wm/overview/transparent_activate_window_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698