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

Side by Side Diff: content/browser/android/popup_touch_handle_drawable.h

Issue 629183002: Replacing the OVERRIDE with override and FINAL with final in content/browser/android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolving Error in android 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 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 #ifndef CONTENT_BROWSER_ANDROID_POPUP_TOUCH_HANDLE_DRAWABLE_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_POPUP_TOUCH_HANDLE_DRAWABLE_H_
6 #define CONTENT_BROWSER_ANDROID_POPUP_TOUCH_HANDLE_DRAWABLE_H_ 6 #define CONTENT_BROWSER_ANDROID_POPUP_TOUCH_HANDLE_DRAWABLE_H_
7 7
8 #include "content/browser/renderer_host/input/touch_handle.h" 8 #include "content/browser/renderer_host/input/touch_handle.h"
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 // Touch handle drawable backed by an Android PopupWindow. 14 // Touch handle drawable backed by an Android PopupWindow.
15 class PopupTouchHandleDrawable : public TouchHandleDrawable { 15 class PopupTouchHandleDrawable : public TouchHandleDrawable {
16 public: 16 public:
17 PopupTouchHandleDrawable(base::android::ScopedJavaLocalRef<jobject> drawable, 17 PopupTouchHandleDrawable(base::android::ScopedJavaLocalRef<jobject> drawable,
18 float dpi_scale); 18 float dpi_scale);
19 virtual ~PopupTouchHandleDrawable(); 19 virtual ~PopupTouchHandleDrawable();
20 20
21 // TouchHandleDrawable implementation. 21 // TouchHandleDrawable implementation.
22 virtual void SetEnabled(bool enabled) OVERRIDE; 22 virtual void SetEnabled(bool enabled) override;
23 virtual void SetOrientation(TouchHandleOrientation orientation) OVERRIDE; 23 virtual void SetOrientation(TouchHandleOrientation orientation) override;
24 virtual void SetAlpha(float alpha) OVERRIDE; 24 virtual void SetAlpha(float alpha) override;
25 virtual void SetFocus(const gfx::PointF& position) OVERRIDE; 25 virtual void SetFocus(const gfx::PointF& position) override;
26 virtual void SetVisible(bool visible) OVERRIDE; 26 virtual void SetVisible(bool visible) override;
27 virtual bool IntersectsWith(const gfx::RectF& rect) const OVERRIDE; 27 virtual bool IntersectsWith(const gfx::RectF& rect) const override;
28 28
29 static bool RegisterPopupTouchHandleDrawable(JNIEnv* env); 29 static bool RegisterPopupTouchHandleDrawable(JNIEnv* env);
30 30
31 private: 31 private:
32 const float dpi_scale_; 32 const float dpi_scale_;
33 base::android::ScopedJavaGlobalRef<jobject> drawable_; 33 base::android::ScopedJavaGlobalRef<jobject> drawable_;
34 34
35 DISALLOW_COPY_AND_ASSIGN(PopupTouchHandleDrawable); 35 DISALLOW_COPY_AND_ASSIGN(PopupTouchHandleDrawable);
36 }; 36 };
37 37
38 } // namespace content 38 } // namespace content
39 39
40 #endif // CONTENT_BROWSER_ANDROID_POPUP_TOUCH_HANDLE_DRAWABLE_H_ 40 #endif // CONTENT_BROWSER_ANDROID_POPUP_TOUCH_HANDLE_DRAWABLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698