| Index: ui/aura/remote_root_window_host_win.cc
|
| diff --git a/ui/aura/remote_root_window_host_win.cc b/ui/aura/remote_root_window_host_win.cc
|
| index 9d1782dc4e54308e653c6cbc25dc9e6e3350ad4e..962f19d16586aa15a9e17fd30467cf8039d8e108 100644
|
| --- a/ui/aura/remote_root_window_host_win.cc
|
| +++ b/ui/aura/remote_root_window_host_win.cc
|
| @@ -33,7 +33,7 @@ const int kRemoteWindowTouchId = 10;
|
|
|
| void HandleOpenFile(
|
| const string16& title,
|
| - const FilePath& default_path,
|
| + const base::FilePath& default_path,
|
| const string16& filter,
|
| const OpenFileCompletion& callback) {
|
| DCHECK(aura::RemoteRootWindowHostWin::Instance());
|
| @@ -45,7 +45,7 @@ void HandleOpenFile(
|
|
|
| void HandleOpenMultipleFiles(
|
| const string16& title,
|
| - const FilePath& default_path,
|
| + const base::FilePath& default_path,
|
| const string16& filter,
|
| const OpenMultipleFilesCompletion& callback) {
|
| DCHECK(aura::RemoteRootWindowHostWin::Instance());
|
| @@ -58,7 +58,7 @@ void HandleOpenMultipleFiles(
|
|
|
| void HandleSaveFile(
|
| const string16& title,
|
| - const FilePath& default_path,
|
| + const base::FilePath& default_path,
|
| const string16& filter,
|
| int filter_index,
|
| const string16& default_extension,
|
| @@ -131,7 +131,7 @@ bool RemoteRootWindowHostWin::OnMessageReceived(const IPC::Message& message) {
|
|
|
| void RemoteRootWindowHostWin::HandleOpenFile(
|
| const string16& title,
|
| - const FilePath& default_path,
|
| + const base::FilePath& default_path,
|
| const string16& filter,
|
| const OpenFileCompletion& callback) {
|
| if (!host_)
|
| @@ -149,7 +149,7 @@ void RemoteRootWindowHostWin::HandleOpenFile(
|
|
|
| void RemoteRootWindowHostWin::HandleOpenMultipleFiles(
|
| const string16& title,
|
| - const FilePath& default_path,
|
| + const base::FilePath& default_path,
|
| const string16& filter,
|
| const OpenMultipleFilesCompletion& callback) {
|
| if (!host_)
|
| @@ -167,7 +167,7 @@ void RemoteRootWindowHostWin::HandleOpenMultipleFiles(
|
|
|
| void RemoteRootWindowHostWin::HandleSaveFile(
|
| const string16& title,
|
| - const FilePath& default_path,
|
| + const base::FilePath& default_path,
|
| const string16& filter,
|
| int filter_index,
|
| const string16& default_extension,
|
| @@ -382,7 +382,7 @@ void RemoteRootWindowHostWin::OnFileSaveAsDone(bool success,
|
| int filter_index) {
|
| if (success) {
|
| file_saveas_completion_callback_.Run(
|
| - FilePath(filename), filter_index, NULL);
|
| + base::FilePath(filename), filter_index, NULL);
|
| }
|
| file_saveas_completion_callback_.Reset();
|
| }
|
| @@ -391,14 +391,14 @@ void RemoteRootWindowHostWin::OnFileSaveAsDone(bool success,
|
| void RemoteRootWindowHostWin::OnFileOpenDone(bool success, string16 filename) {
|
| if (success) {
|
| file_open_completion_callback_.Run(
|
| - FilePath(filename), 0, NULL);
|
| + base::FilePath(filename), 0, NULL);
|
| }
|
| file_open_completion_callback_.Reset();
|
| }
|
|
|
| void RemoteRootWindowHostWin::OnMultiFileOpenDone(
|
| bool success,
|
| - const std::vector<FilePath>& files) {
|
| + const std::vector<base::FilePath>& files) {
|
| if (success) {
|
| multi_file_open_completion_callback_.Run(files, NULL);
|
| }
|
|
|