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

Side by Side Diff: chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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 (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup. h" 5 #include "chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup. h"
6 6
7 #include "ui/aura/client/screen_position_client.h" 7 #include "ui/aura/client/screen_position_client.h"
8 #include "ui/events/event.h" 8 #include "ui/events/event.h"
9 #include "ui/events/event_processor.h" 9 #include "ui/events/event_processor.h"
10 #include "ui/events/event_utils.h" 10 #include "ui/events/event_utils.h"
(...skipping 12 matching lines...) Expand all
23 const gfx::ImageSkia* zoomed_skia_image, 23 const gfx::ImageSkia* zoomed_skia_image,
24 const aura::Window* content, 24 const aura::Window* content,
25 LinkDisambiguationPopup* popup, 25 LinkDisambiguationPopup* popup,
26 const base::Callback<void(ui::GestureEvent*)>& gesture_cb, 26 const base::Callback<void(ui::GestureEvent*)>& gesture_cb,
27 const base::Callback<void(ui::MouseEvent*)>& mouse_cb); 27 const base::Callback<void(ui::MouseEvent*)>& mouse_cb);
28 28
29 void Close(); 29 void Close();
30 30
31 private: 31 private:
32 // views::View overrides 32 // views::View overrides
33 virtual gfx::Size GetPreferredSize() const OVERRIDE; 33 virtual gfx::Size GetPreferredSize() const override;
34 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 34 virtual void OnGestureEvent(ui::GestureEvent* event) override;
35 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 35 virtual void OnMouseEvent(ui::MouseEvent* event) override;
36 36
37 // WidgetObserver overrides 37 // WidgetObserver overrides
38 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; 38 virtual void OnWidgetClosing(views::Widget* widget) override;
39 39
40 const float scale_; 40 const float scale_;
41 const aura::Window* content_; 41 const aura::Window* content_;
42 const base::Callback<void(ui::GestureEvent*)> gesture_cb_; 42 const base::Callback<void(ui::GestureEvent*)> gesture_cb_;
43 const base::Callback<void(ui::MouseEvent*)> mouse_cb_; 43 const base::Callback<void(ui::MouseEvent*)> mouse_cb_;
44 LinkDisambiguationPopup* popup_; 44 LinkDisambiguationPopup* popup_;
45 const gfx::Rect target_rect_; 45 const gfx::Rect target_rect_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView); 47 DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView);
48 }; 48 };
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 void LinkDisambiguationPopup::Close() { 189 void LinkDisambiguationPopup::Close() {
190 if (view_) { 190 if (view_) {
191 view_->Close(); 191 view_->Close();
192 view_ = NULL; 192 view_ = NULL;
193 } 193 }
194 } 194 }
195 195
196 void LinkDisambiguationPopup::InvalidateBubbleView() { 196 void LinkDisambiguationPopup::InvalidateBubbleView() {
197 view_ = NULL; 197 view_ = NULL;
198 } 198 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/keyboard_access_browsertest.cc ('k') | chrome/browser/ui/views/load_complete_listener.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698