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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2059533002: Change WebContentsDelegate::RunFileChooser to be frame based. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes based on reviews. Created 4 years, 6 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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "content/public/browser/content_browser_client.h" 69 #include "content/public/browser/content_browser_client.h"
70 #include "content/public/browser/permission_manager.h" 70 #include "content/public/browser/permission_manager.h"
71 #include "content/public/browser/permission_type.h" 71 #include "content/public/browser/permission_type.h"
72 #include "content/public/browser/render_process_host.h" 72 #include "content/public/browser/render_process_host.h"
73 #include "content/public/browser/render_widget_host_view.h" 73 #include "content/public/browser/render_widget_host_view.h"
74 #include "content/public/browser/stream_handle.h" 74 #include "content/public/browser/stream_handle.h"
75 #include "content/public/browser/user_metrics.h" 75 #include "content/public/browser/user_metrics.h"
76 #include "content/public/common/browser_side_navigation_policy.h" 76 #include "content/public/common/browser_side_navigation_policy.h"
77 #include "content/public/common/content_constants.h" 77 #include "content/public/common/content_constants.h"
78 #include "content/public/common/content_switches.h" 78 #include "content/public/common/content_switches.h"
79 #include "content/public/common/file_chooser_file_info.h"
80 #include "content/public/common/file_chooser_params.h"
79 #include "content/public/common/isolated_world_ids.h" 81 #include "content/public/common/isolated_world_ids.h"
80 #include "content/public/common/url_constants.h" 82 #include "content/public/common/url_constants.h"
81 #include "content/public/common/url_utils.h" 83 #include "content/public/common/url_utils.h"
82 #include "device/vibration/vibration_manager_impl.h" 84 #include "device/vibration/vibration_manager_impl.h"
83 #include "ui/accessibility/ax_tree.h" 85 #include "ui/accessibility/ax_tree.h"
84 #include "ui/accessibility/ax_tree_update.h" 86 #include "ui/accessibility/ax_tree_update.h"
85 #include "ui/gfx/geometry/quad_f.h" 87 #include "ui/gfx/geometry/quad_f.h"
86 #include "url/gurl.h" 88 #include "url/gurl.h"
87 89
88 #if defined(OS_ANDROID) 90 #if defined(OS_ANDROID)
(...skipping 2522 matching lines...) Expand 10 before | Expand all | Expand 10 after
2611 2613
2612 return is_live; 2614 return is_live;
2613 } 2615 }
2614 2616
2615 int RenderFrameHostImpl::GetProxyCount() { 2617 int RenderFrameHostImpl::GetProxyCount() {
2616 if (this != frame_tree_node_->current_frame_host()) 2618 if (this != frame_tree_node_->current_frame_host())
2617 return 0; 2619 return 0;
2618 return frame_tree_node_->render_manager()->GetProxyCount(); 2620 return frame_tree_node_->render_manager()->GetProxyCount();
2619 } 2621 }
2620 2622
2623 void RenderFrameHostImpl::FilesSelectedInChooser(
2624 const std::vector<content::FileChooserFileInfo>& files,
2625 FileChooserParams::Mode permissions) {
2626 render_view_host_->FilesSelectedInChooser(files, permissions);
2627 }
2628
2621 #if defined(USE_EXTERNAL_POPUP_MENU) 2629 #if defined(USE_EXTERNAL_POPUP_MENU)
2622 #if defined(OS_MACOSX) 2630 #if defined(OS_MACOSX)
2623 2631
2624 void RenderFrameHostImpl::DidSelectPopupMenuItem(int selected_index) { 2632 void RenderFrameHostImpl::DidSelectPopupMenuItem(int selected_index) {
2625 Send(new FrameMsg_SelectPopupMenuItem(routing_id_, selected_index)); 2633 Send(new FrameMsg_SelectPopupMenuItem(routing_id_, selected_index));
2626 } 2634 }
2627 2635
2628 void RenderFrameHostImpl::DidCancelPopupMenu() { 2636 void RenderFrameHostImpl::DidCancelPopupMenu() {
2629 Send(new FrameMsg_SelectPopupMenuItem(routing_id_, -1)); 2637 Send(new FrameMsg_SelectPopupMenuItem(routing_id_, -1));
2630 } 2638 }
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
2858 // handler after it's destroyed so it can't run after the RFHI is destroyed. 2866 // handler after it's destroyed so it can't run after the RFHI is destroyed.
2859 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 2867 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
2860 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 2868 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
2861 } 2869 }
2862 2870
2863 void RenderFrameHostImpl::DeleteWebBluetoothService() { 2871 void RenderFrameHostImpl::DeleteWebBluetoothService() {
2864 web_bluetooth_service_.reset(); 2872 web_bluetooth_service_.reset();
2865 } 2873 }
2866 2874
2867 } // namespace content 2875 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698