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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2215133002: Change signature of OnConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: . Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 blame_context_(nullptr), 1115 blame_context_(nullptr),
1116 #if defined(ENABLE_PLUGINS) 1116 #if defined(ENABLE_PLUGINS)
1117 focused_pepper_plugin_(nullptr), 1117 focused_pepper_plugin_(nullptr),
1118 pepper_last_mouse_event_target_(nullptr), 1118 pepper_last_mouse_event_target_(nullptr),
1119 #endif 1119 #endif
1120 frame_binding_(this), 1120 frame_binding_(this),
1121 weak_factory_(this) { 1121 weak_factory_(this) {
1122 // We don't have a shell::Connection at this point, so use nullptr. 1122 // We don't have a shell::Connection at this point, so use nullptr.
1123 // TODO(beng): We should fix this, so we can apply policy about which 1123 // TODO(beng): We should fix this, so we can apply policy about which
1124 // interfaces get exposed. 1124 // interfaces get exposed.
1125 interface_registry_.reset(new shell::InterfaceRegistry(nullptr)); 1125 interface_registry_.reset(new shell::InterfaceRegistry);
1126 shell::mojom::InterfaceProviderPtr remote_interfaces; 1126 shell::mojom::InterfaceProviderPtr remote_interfaces;
1127 pending_remote_interface_provider_request_ = GetProxy(&remote_interfaces); 1127 pending_remote_interface_provider_request_ = GetProxy(&remote_interfaces);
1128 remote_interfaces_.reset(new shell::InterfaceProvider); 1128 remote_interfaces_.reset(new shell::InterfaceProvider);
1129 remote_interfaces_->Bind(std::move(remote_interfaces)); 1129 remote_interfaces_->Bind(std::move(remote_interfaces));
1130 blink_interface_provider_.reset(new BlinkInterfaceProviderImpl( 1130 blink_interface_provider_.reset(new BlinkInterfaceProviderImpl(
1131 remote_interfaces_->GetWeakPtr())); 1131 remote_interfaces_->GetWeakPtr()));
1132 1132
1133 std::pair<RoutingIDFrameMap::iterator, bool> result = 1133 std::pair<RoutingIDFrameMap::iterator, bool> result =
1134 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); 1134 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
1135 CHECK(result.second) << "Inserting a duplicate item."; 1135 CHECK(result.second) << "Inserting a duplicate item.";
(...skipping 5194 matching lines...) Expand 10 before | Expand all | Expand 10 after
6330 // event target. Potentially a Pepper plugin will receive the event. 6330 // event target. Potentially a Pepper plugin will receive the event.
6331 // In order to tell whether a plugin gets the last mouse event and which it 6331 // In order to tell whether a plugin gets the last mouse event and which it
6332 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6332 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6333 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6333 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6334 // |pepper_last_mouse_event_target_|. 6334 // |pepper_last_mouse_event_target_|.
6335 pepper_last_mouse_event_target_ = nullptr; 6335 pepper_last_mouse_event_target_ = nullptr;
6336 #endif 6336 #endif
6337 } 6337 }
6338 6338
6339 } // namespace content 6339 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698