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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 2828353002: Android: Remove GetApplicationContext part 3 (Closed)
Patch Set: Fix android webview tests Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
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(
« no previous file with comments | « content/browser/memory/memory_monitor_android.cc ('k') | content/browser/speech/speech_recognizer_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698