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

Side by Side Diff: ash/wm/overview/window_selector_panels.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/overview/window_selector_panels.h ('k') | ash/wm/overview/window_selector_unittest.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 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/window_selector_panels.h" 5 #include "ash/wm/overview/window_selector_panels.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 "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/wm/overview/scoped_transform_overview_window.h" 10 #include "ash/wm/overview/scoped_transform_overview_window.h"
(...skipping 12 matching lines...) Expand all
23 23
24 // This class extends ScopedTransformOverviewMode to hide and show the callout 24 // This class extends ScopedTransformOverviewMode to hide and show the callout
25 // widget for a panel window when entering / leaving overview mode, as well as 25 // widget for a panel window when entering / leaving overview mode, as well as
26 // to add a transparent button for each panel window. 26 // to add a transparent button for each panel window.
27 class ScopedTransformPanelWindow : public ScopedTransformOverviewWindow { 27 class ScopedTransformPanelWindow : public ScopedTransformOverviewWindow {
28 public: 28 public:
29 explicit ScopedTransformPanelWindow(aura::Window* window); 29 explicit ScopedTransformPanelWindow(aura::Window* window);
30 virtual ~ScopedTransformPanelWindow(); 30 virtual ~ScopedTransformPanelWindow();
31 31
32 // ScopedTransformOverviewWindow overrides: 32 // ScopedTransformOverviewWindow overrides:
33 virtual void PrepareForOverview() OVERRIDE; 33 virtual void PrepareForOverview() override;
34 34
35 virtual void SetTransform( 35 virtual void SetTransform(
36 aura::Window* root_window, 36 aura::Window* root_window,
37 const gfx::Transform& transform, 37 const gfx::Transform& transform,
38 bool animate) OVERRIDE; 38 bool animate) override;
39 39
40 private: 40 private:
41 // Returns the panel window bounds after the transformation. 41 // Returns the panel window bounds after the transformation.
42 gfx::Rect GetTransformedBounds(); 42 gfx::Rect GetTransformedBounds();
43 43
44 scoped_ptr<TransparentActivateWindowButton> window_button_; 44 scoped_ptr<TransparentActivateWindowButton> window_button_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(ScopedTransformPanelWindow); 46 DISALLOW_COPY_AND_ASSIGN(ScopedTransformPanelWindow);
47 }; 47 };
48 48
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 // TODO(flackr): find a way to make panels that are hidden behind other panels 209 // TODO(flackr): find a way to make panels that are hidden behind other panels
210 // look nice. 210 // look nice.
211 for (WindowList::iterator iter = transform_windows_.begin(); 211 for (WindowList::iterator iter = transform_windows_.begin();
212 iter != transform_windows_.end(); iter++) { 212 iter != transform_windows_.end(); iter++) {
213 (*iter)->window()->layer()->SetOpacity(opacity); 213 (*iter)->window()->layer()->SetOpacity(opacity);
214 } 214 }
215 WindowSelectorItem::SetOpacity(opacity); 215 WindowSelectorItem::SetOpacity(opacity);
216 } 216 }
217 217
218 } // namespace ash 218 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/overview/window_selector_panels.h ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698