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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" 5 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h"
6 6
7 #include <X11/Xatom.h> 7 #include <X11/Xatom.h>
8 8
9 #include "base/event_types.h" 9 #include "base/event_types.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // Creates a ui::DragDropTypes::DragOperation representation of the current 137 // Creates a ui::DragDropTypes::DragOperation representation of the current
138 // action list. 138 // action list.
139 int GetDragOperation() const; 139 int GetDragOperation() const;
140 140
141 private: 141 private:
142 // Masks the X11 atom |xdnd_operation|'s views representation onto 142 // Masks the X11 atom |xdnd_operation|'s views representation onto
143 // |drag_operation|. 143 // |drag_operation|.
144 void MaskOperation(::Atom xdnd_operation, int* drag_operation) const; 144 void MaskOperation(::Atom xdnd_operation, int* drag_operation) const;
145 145
146 // ui::PlatformEventDispatcher: 146 // ui::PlatformEventDispatcher:
147 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; 147 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
148 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; 148 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
149 149
150 // The atom cache owned by our parent. 150 // The atom cache owned by our parent.
151 ui::X11AtomCache* atom_cache_; 151 ui::X11AtomCache* atom_cache_;
152 152
153 // The XID of our chrome local aura window handling our events. 153 // The XID of our chrome local aura window handling our events.
154 ::Window local_window_; 154 ::Window local_window_;
155 155
156 // The XID of the window that's initiated the drag. 156 // The XID of the window that's initiated the drag.
157 unsigned long source_window_; 157 unsigned long source_window_;
158 158
(...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 for (int x = 0; x < in_bitmap->width(); ++x) { 1128 for (int x = 0; x < in_bitmap->width(); ++x) {
1129 if (SkColorGetA(in_row[x]) > kMinAlpha) 1129 if (SkColorGetA(in_row[x]) > kMinAlpha)
1130 return true; 1130 return true;
1131 } 1131 }
1132 } 1132 }
1133 1133
1134 return false; 1134 return false;
1135 } 1135 }
1136 1136
1137 } // namespace views 1137 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698