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

Side by Side Diff: content/browser/web_contents/web_contents_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 return false; 726 return false;
727 } 727 }
728 728
729 return true; 729 return true;
730 } 730 }
731 731
732 void WebContentsImpl::RunFileChooser( 732 void WebContentsImpl::RunFileChooser(
733 RenderViewHost* render_view_host, 733 RenderViewHost* render_view_host,
734 const FileChooserParams& params) { 734 const FileChooserParams& params) {
735 if (delegate_) 735 if (delegate_)
736 delegate_->RunFileChooser(this, params); 736 delegate_->RunFileChooser(GetMainFrame(), params);
737 } 737 }
738 738
739 NavigationControllerImpl& WebContentsImpl::GetController() { 739 NavigationControllerImpl& WebContentsImpl::GetController() {
740 return controller_; 740 return controller_;
741 } 741 }
742 742
743 const NavigationControllerImpl& WebContentsImpl::GetController() const { 743 const NavigationControllerImpl& WebContentsImpl::GetController() const {
744 return controller_; 744 return controller_;
745 } 745 }
746 746
(...skipping 4358 matching lines...) Expand 10 before | Expand all | Expand 10 after
5105 for (RenderViewHost* render_view_host : render_view_host_set) 5105 for (RenderViewHost* render_view_host : render_view_host_set)
5106 render_view_host->OnWebkitPreferencesChanged(); 5106 render_view_host->OnWebkitPreferencesChanged();
5107 } 5107 }
5108 5108
5109 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5109 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5110 JavaScriptDialogManager* dialog_manager) { 5110 JavaScriptDialogManager* dialog_manager) {
5111 dialog_manager_ = dialog_manager; 5111 dialog_manager_ = dialog_manager;
5112 } 5112 }
5113 5113
5114 } // namespace content 5114 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager_browsertest.cc ('k') | content/public/browser/render_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698