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

Unified Diff: content/renderer/render_view_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/renderer/render_view_impl.h ('k') | ui/base/dialogs/base_shell_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 2675f85bb6be291676d411c7aa39c923cabecc0e..c8281efcfc13f81f50d83ec2e1b5dca673fe8e01 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -49,7 +49,6 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/context_menu_params.h"
#include "content/public/common/file_chooser_params.h"
-#include "content/public/common/selected_file_info.h"
#include "content/public/common/url_constants.h"
#include "content/public/renderer/content_renderer_client.h"
#include "content/public/renderer/document_state.h"
@@ -163,6 +162,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.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 "ui/gfx/point.h"
#include "ui/gfx/rect.h"
@@ -4603,7 +4603,7 @@ void RenderViewImpl::OnEnumerateDirectoryResponse(
}
void RenderViewImpl::OnFileChooserResponse(
- const std::vector<content::SelectedFileInfo>& files) {
+ const std::vector<ui::SelectedFileInfo>& files) {
// This could happen if we navigated to a different page before the user
// closed the chooser.
if (file_chooser_completions_.empty())
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | ui/base/dialogs/base_shell_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698