android_webview: Let AwContents manage TouchHandleDrawable

android_webview/native/popup_touch_handle_drawable.h

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_ANDROID_POPUP_TOUCH_HANDLE_DRAWABLE_H_
 #define CONTENT_BROWSER_ANDROID_POPUP_TOUCH_HANDLE_DRAWABLE_H_
 
 #include "ui/touch_selection/touch_handle.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/macros.h"
 
 namespace content {
+class ContentViewCore;
+}
 
-class ContentViewCore;
+namespace android_webview {
 
 // Touch handle drawable backed by an Android PopupWindow.
 class PopupTouchHandleDrawable : public ui::TouchHandleDrawable {
  public:
   static std::unique_ptr<PopupTouchHandleDrawable> Create(
-      ContentViewCore* content_view_core,
+      content::ContentViewCore* content_view_core,
       float dpi_scale);
   ~PopupTouchHandleDrawable() override;
 
   // ui::TouchHandleDrawable implementation.
   void SetEnabled(bool enabled) override;
   void SetOrientation(ui::TouchHandleOrientation orientation,
                       bool mirror_vertical,
                       bool mirror_horizontal) override;
   void SetOrigin(const gfx::PointF& origin) override;
   void SetAlpha(float alpha) override;
   gfx::RectF GetVisibleBounds() const override;
   float GetDrawableHorizontalPaddingRatio() const override;
 
+  const JavaObjectWeakGlobalRef GetJavaObj() const { return java_ref_; };
+
  private:
   PopupTouchHandleDrawable(JNIEnv* env, jobject obj, float dpi_scale);
 
   JavaObjectWeakGlobalRef java_ref_;
 
   const float dpi_scale_;
   float drawable_horizontal_padding_ratio_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupTouchHandleDrawable);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_POPUP_TOUCH_HANDLE_DRAWABLE_H_