Revert of Refactor ContentViewClient (4/6)

ui/android/view_android.cc

 // 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.
 
 #include "ui/android/view_android.h"
 
 #include <algorithm>
 
 #include "base/android/jni_android.h"
-#include "base/android/jni_string.h"
 #include "cc/layers/layer.h"
 #include "jni/ViewAndroidDelegate_jni.h"
 #include "ui/android/window_android.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
-#include "url/gurl.h"
 
 namespace ui {
 
-using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
 // ViewAndroid::ScopedAndroidView
 ViewAndroid::ScopedAnchorView::ScopedAnchorView(
     JNIEnv* env,
     const JavaRef<jobject>& jview,
     const JavaRef<jobject>& jdelegate)
     : view_(env, jview.obj()), delegate_(env, jdelegate.obj()) {
   // If there's a view, then we need a delegate to remove it.
@@ skipping 180 matching lines @@
 bool ViewAndroid::IsViewRoot() {
   return GetViewRoot() == this;
 }
 
 bool ViewAndroid::StartDragAndDrop(const JavaRef<jstring>& jtext,
                                    const JavaRef<jobject>& jimage) {
   ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
   if (delegate.is_null())
     return false;
   JNIEnv* env = base::android::AttachCurrentThread();
-  return Java_ViewAndroidDelegate_startDragAndDrop(env,
-                                                   delegate,
-                                                   jtext,
+  return Java_ViewAndroidDelegate_startDragAndDrop(env, delegate, jtext,
                                                    jimage);
 }
 
 bool ViewAndroid::OnTouchEventInternal(const MotionEventData& event) {
   if (!children_.empty()) {
     const MotionEventData& e =
       origin_.IsOrigin() ? event : event.Offset(-origin_.x(), -origin_.y());
 
     for (auto it = children_.rbegin(); it != children_.rend(); ++it) {
       bool matched = (*it)->match_parent_;
       if (!matched) {
         gfx::Rect bound((*it)->origin_, (*it)->size_);
         matched = bound.Contains(e.GetX(), e.GetY());
       }
       if (matched && (*it)->OnTouchEventInternal(e))
         return true;
     }
   }
 
   if (client_ && client_->OnTouchEvent(event))
     return true;
 
   return false;
 }
 
-void ViewAndroid::OnBackgroundColorChanged(unsigned int color) {
-  ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
-  if (delegate.is_null())
-    return;
-  JNIEnv* env = base::android::AttachCurrentThread();
-  Java_ViewAndroidDelegate_onBackgroundColorChanged(env,
-                                                    delegate,
-                                                    color);
-}
-
-void ViewAndroid::OnTopControlsChanged(float top_controls_offset,
-                                       float top_content_offset) {
-  ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
-  if (delegate.is_null())
-    return;
-  JNIEnv* env = base::android::AttachCurrentThread();
-  Java_ViewAndroidDelegate_onTopControlsChanged(env,
-                                                delegate,
-                                                top_controls_offset,
-                                                top_content_offset);
-}
-
-void ViewAndroid::OnBottomControlsChanged(float bottom_controls_offset,
-                                          float bottom_content_offset) {
-  ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
-  if (delegate.is_null())
-    return;
-  JNIEnv* env = base::android::AttachCurrentThread();
-  Java_ViewAndroidDelegate_onBottomControlsChanged(env,
-                                                   delegate,
-                                                   bottom_controls_offset,
-                                                   bottom_content_offset);
-}
-
-void ViewAndroid::StartContentIntent(const GURL& content_url,
-                                       bool is_main_frame) {
-  ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
-  if (delegate.is_null())
-    return;
-  JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> jcontent_url =
-      ConvertUTF8ToJavaString(env, content_url.spec());
-  Java_ViewAndroidDelegate_onStartContentIntent(env,
-                                                delegate,
-                                                jcontent_url,
-                                                is_main_frame);
-
-}
 }  // namespace ui