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

Unified Diff: chrome/browser/file_select_helper.cc

Issue 8622005: Get rid of view_messages.h include from chrome since TabContentsDelegate used a struct from it (V... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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 | « chrome/browser/file_select_helper.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/file_select_helper.cc
===================================================================
--- chrome/browser/file_select_helper.cc (revision 110979)
+++ chrome/browser/file_select_helper.cc (working copy)
@@ -19,10 +19,10 @@
#include "content/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
-#include "content/common/view_messages.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h"
+#include "content/public/common/file_chooser_params.h"
#include "grit/generated_resources.h"
#include "net/base/mime_util.h"
#include "ui/base/l10n/l10n_util.h"
@@ -264,7 +264,7 @@
void FileSelectHelper::RunFileChooser(
RenderViewHost* render_view_host,
TabContents* tab_contents,
- const ViewHostMsg_RunFileChooser_Params& params) {
+ const content::FileChooserParams& params) {
DCHECK(!render_view_host_);
DCHECK(!tab_contents_);
render_view_host_ = render_view_host;
@@ -290,7 +290,7 @@
}
void FileSelectHelper::RunFileChooserOnFileThread(
- const ViewHostMsg_RunFileChooser_Params& params) {
+ const content::FileChooserParams& params) {
select_file_types_.reset(
GetFileTypesFromAcceptType(params.accept_types));
@@ -300,7 +300,7 @@
}
void FileSelectHelper::RunFileChooserOnUIThread(
- const ViewHostMsg_RunFileChooser_Params& params) {
+ const content::FileChooserParams& params) {
if (!render_view_host_ || !tab_contents_)
return;
@@ -308,16 +308,16 @@
select_file_dialog_ = SelectFileDialog::Create(this);
switch (params.mode) {
- case ViewHostMsg_RunFileChooser_Mode::Open:
+ case content::FileChooserParams::Open:
dialog_type_ = SelectFileDialog::SELECT_OPEN_FILE;
break;
- case ViewHostMsg_RunFileChooser_Mode::OpenMultiple:
+ case content::FileChooserParams::OpenMultiple:
dialog_type_ = SelectFileDialog::SELECT_OPEN_MULTI_FILE;
break;
- case ViewHostMsg_RunFileChooser_Mode::OpenFolder:
+ case content::FileChooserParams::OpenFolder:
dialog_type_ = SelectFileDialog::SELECT_FOLDER;
break;
- case ViewHostMsg_RunFileChooser_Mode::Save:
+ case content::FileChooserParams::Save:
dialog_type_ = SelectFileDialog::SELECT_SAVEAS_FILE;
break;
default:
« no previous file with comments | « chrome/browser/file_select_helper.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698