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

Unified Diff: content/renderer/render_widget.cc

Issue 2651593002: mus: Remove the old client lib. (Closed)
Patch Set: restore test Created 3 years, 11 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
« no previous file with comments | « content/renderer/mus/render_widget_mus_connection.cc ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 70059c771fb313ad72a56f4bec5c38fc4a10c966..709a87983536b70d37d772d474567a2869e0bfd0 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -180,22 +180,6 @@ bool IsDateTimeInput(ui::TextInputType type) {
type == ui::TEXT_INPUT_TYPE_TIME || type == ui::TEXT_INPUT_TYPE_WEEK;
}
-content::RenderWidgetInputHandlerDelegate* GetRenderWidgetInputHandlerDelegate(
- content::RenderWidget* widget) {
-#if defined(USE_AURA)
- const base::CommandLine& cmdline = *base::CommandLine::ForCurrentProcess();
- if (content::ServiceManagerConnection::GetForProcess() &&
- cmdline.HasSwitch(switches::kUseMusInRenderer)) {
- return content::RenderWidgetMusConnection::GetOrCreate(
- widget->routing_id());
- }
-#endif
- // If we don't have a connection to the Service Manager, then we want to route
- // IPCs back to the browser process rather than Mus so we use the |widget| as
- // the RenderWidgetInputHandlerDelegate.
- return widget;
-}
-
WebDragData DropMetaDataToWebDragData(
const std::vector<DropData::Metadata>& drop_meta_data) {
std::vector<WebDragData::Item> item_list;
@@ -524,8 +508,7 @@ void RenderWidget::Init(const ShowCallback& show_callback,
DCHECK(!webwidget_internal_);
DCHECK_NE(routing_id_, MSG_ROUTING_NONE);
- input_handler_.reset(new RenderWidgetInputHandler(
- GetRenderWidgetInputHandlerDelegate(this), this));
+ input_handler_ = base::MakeUnique<RenderWidgetInputHandler>(this, this);
show_callback_ = show_callback;
« no previous file with comments | « content/renderer/mus/render_widget_mus_connection.cc ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698