| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index 4c3471fde722dc6d7b8a3d9a89cf588eeb55c98c..5275ebf5656f66f836d3a64ab6e52ca9c059fac9 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -10,7 +10,6 @@
|
|
|
| #include "base/android/application_status_listener.h"
|
| #include "base/android/build_info.h"
|
| -#include "base/android/context_utils.h"
|
| #include "base/bind.h"
|
| #include "base/callback_helpers.h"
|
| #include "base/command_line.h"
|
| @@ -1320,13 +1319,12 @@ RenderWidgetHostViewAndroid::CreateDrawable() {
|
| }
|
| base::android::ScopedJavaLocalRef<jobject> activityContext =
|
| content_view_core_->GetContext();
|
| + // If activityContext is null then Application context is used instead on
|
| + // the java side in CompositedTouchHandleDrawable.
|
| return std::unique_ptr<ui::TouchHandleDrawable>(
|
| new CompositedTouchHandleDrawable(
|
| content_view_core_->GetViewAndroid()->GetLayer(), view_.GetDipScale(),
|
| - // Use the activity context where possible (instead of the application
|
| - // context) to ensure proper handle theming.
|
| - activityContext.is_null() ? base::android::GetApplicationContext()
|
| - : activityContext));
|
| + activityContext));
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::SynchronousCopyContents(
|
|
|