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

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 10669023: Start consolidating non-port specific code to ui/base/dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clenaup Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 2134a756f41e0bd33a24f060b564416219d0d3a1..044ee95edfcd8ec3543f696035513599e6870962 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -52,11 +52,11 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/context_menu_params.h"
#include "content/public/common/result_codes.h"
-#include "content/public/common/selected_file_info.h"
#include "content/public/common/url_constants.h"
#include "net/base/net_util.h"
#include "net/url_request/url_request_context_getter.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/dialogs/selected_file_info.h"
#include "ui/gfx/native_widget_types.h"
#include "webkit/fileapi/isolated_context.h"
#include "webkit/glue/webdropdata.h"
@@ -770,11 +770,11 @@ void RenderViewHostImpl::SetInitialFocus(bool reverse) {
}
void RenderViewHostImpl::FilesSelectedInChooser(
- const std::vector<SelectedFileInfo>& files,
+ const std::vector<ui::SelectedFileInfo>& files,
int permissions) {
// Grant the security access requested to the given files.
for (size_t i = 0; i < files.size(); ++i) {
- const SelectedFileInfo& file = files[i];
+ const ui::SelectedFileInfo& file = files[i];
ChildProcessSecurityPolicyImpl::GetInstance()->GrantPermissionsForFile(
GetProcess()->GetID(), file.path, permissions);
}
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698