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

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

Issue 817393002: Standardize usage of virtual/override/final specifiers in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/scoped_transform_overview_window.h ('k') | no next file » | 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 #include "ash/wm/overview/transparent_activate_window_button.h" 5 #include "ash/wm/overview/transparent_activate_window_button.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 17 matching lines...) Expand all
28 : public views::CustomButton, 28 : public views::CustomButton,
29 public views::ButtonListener { 29 public views::ButtonListener {
30 public: 30 public:
31 explicit TransparentButton(TransparentActivateWindowButtonDelegate* delegate); 31 explicit TransparentButton(TransparentActivateWindowButtonDelegate* delegate);
32 32
33 ~TransparentButton() override; 33 ~TransparentButton() override;
34 34
35 TransparentActivateWindowButtonDelegate* delegate() { return delegate_; } 35 TransparentActivateWindowButtonDelegate* delegate() { return delegate_; }
36 36
37 // views::View: 37 // views::View:
38 virtual void OnGestureEvent(ui::GestureEvent* event) override; 38 void OnGestureEvent(ui::GestureEvent* event) override;
39 39
40 virtual const char* GetClassName() const override { 40 const char* GetClassName() const override { return kTransparentButtonName; }
41 return kTransparentButtonName;
42 }
43 41
44 // views::ButtonListener: 42 // views::ButtonListener:
45 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 43 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
46 44
47 private: 45 private:
48 TransparentActivateWindowButtonDelegate* delegate_; 46 TransparentActivateWindowButtonDelegate* delegate_;
49 47
50 DISALLOW_COPY_AND_ASSIGN(TransparentButton); 48 DISALLOW_COPY_AND_ASSIGN(TransparentButton);
51 }; 49 };
52 50
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 135
138 void TransparentActivateWindowButton::StackAbove( 136 void TransparentActivateWindowButton::StackAbove(
139 TransparentActivateWindowButton* activate_button) { 137 TransparentActivateWindowButton* activate_button) {
140 aura::Window* this_window = event_handler_widget_->GetNativeWindow(); 138 aura::Window* this_window = event_handler_widget_->GetNativeWindow();
141 aura::Window* other_window = activate_button->event_handler_widget_-> 139 aura::Window* other_window = activate_button->event_handler_widget_->
142 GetNativeWindow(); 140 GetNativeWindow();
143 this_window->parent()->StackChildAbove(this_window, other_window); 141 this_window->parent()->StackChildAbove(this_window, other_window);
144 } 142 }
145 143
146 } // namespace ash 144 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/overview/scoped_transform_overview_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698