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

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

Issue 2346903002: Fixes for WebContents associated interfaces support (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1568 matching lines...) Expand 10 before | Expand all | Expand 10 after
1579 #endif 1579 #endif
1580 1580
1581 #if defined(OS_MACOSX) 1581 #if defined(OS_MACOSX)
1582 IPC_MESSAGE_HANDLER(InputMsg_CopyToFindPboard, OnCopyToFindPboard) 1582 IPC_MESSAGE_HANDLER(InputMsg_CopyToFindPboard, OnCopyToFindPboard)
1583 #endif 1583 #endif
1584 IPC_END_MESSAGE_MAP() 1584 IPC_END_MESSAGE_MAP()
1585 1585
1586 return handled; 1586 return handled;
1587 } 1587 }
1588 1588
1589 void RenderFrameImpl::OnAssociatedInterfaceRequest(
1590 const std::string& interface_name,
1591 mojo::ScopedInterfaceEndpointHandle handle) {
1592 associated_interfaces_.BindRequest(interface_name, std::move(handle));
1593 }
1594
1589 void RenderFrameImpl::OnNavigate( 1595 void RenderFrameImpl::OnNavigate(
1590 const CommonNavigationParams& common_params, 1596 const CommonNavigationParams& common_params,
1591 const StartNavigationParams& start_params, 1597 const StartNavigationParams& start_params,
1592 const RequestNavigationParams& request_params) { 1598 const RequestNavigationParams& request_params) {
1593 // If this RenderFrame is going to replace a RenderFrameProxy, it is possible 1599 // If this RenderFrame is going to replace a RenderFrameProxy, it is possible
1594 // that the proxy was detached before this navigation request was received. 1600 // that the proxy was detached before this navigation request was received.
1595 // In that case, abort the navigation. See https://crbug.com/526304 and 1601 // In that case, abort the navigation. See https://crbug.com/526304 and
1596 // https://crbug.com/568676. 1602 // https://crbug.com/568676.
1597 // TODO(nasko, alexmos): Eventually, the browser process will send an IPC to 1603 // TODO(nasko, alexmos): Eventually, the browser process will send an IPC to
1598 // clean this frame up after https://crbug.com/548275 is fixed. 1604 // clean this frame up after https://crbug.com/548275 is fixed.
(...skipping 4818 matching lines...) Expand 10 before | Expand all | Expand 10 after
6417 // event target. Potentially a Pepper plugin will receive the event. 6423 // event target. Potentially a Pepper plugin will receive the event.
6418 // In order to tell whether a plugin gets the last mouse event and which it 6424 // In order to tell whether a plugin gets the last mouse event and which it
6419 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6425 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6420 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6426 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6421 // |pepper_last_mouse_event_target_|. 6427 // |pepper_last_mouse_event_target_|.
6422 pepper_last_mouse_event_target_ = nullptr; 6428 pepper_last_mouse_event_target_ = nullptr;
6423 #endif 6429 #endif
6424 } 6430 }
6425 6431
6426 } // namespace content 6432 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698