OLD | NEW |
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 "chrome/browser/extensions/api/developer_private/entry_picker.h" | 5 #include "chrome/browser/extensions/api/developer_private/entry_picker.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 base::Unretained(this), static_cast<void*>(NULL))); | 57 base::Unretained(this), static_cast<void*>(NULL))); |
58 } | 58 } |
59 return; | 59 return; |
60 } | 60 } |
61 | 61 |
62 select_file_dialog_->SelectFile(picker_type, | 62 select_file_dialog_->SelectFile(picker_type, |
63 select_title, | 63 select_title, |
64 last_directory, | 64 last_directory, |
65 &info, | 65 &info, |
66 file_type_index, | 66 file_type_index, |
67 FILE_PATH_LITERAL(""), | 67 base::FilePath::StringType(), |
68 owning_window, NULL); | 68 owning_window, |
| 69 NULL); |
69 } | 70 } |
70 | 71 |
71 EntryPicker::~EntryPicker() {} | 72 EntryPicker::~EntryPicker() {} |
72 | 73 |
73 void EntryPicker::FileSelected(const base::FilePath& path, | 74 void EntryPicker::FileSelected(const base::FilePath& path, |
74 int index, | 75 int index, |
75 void* params) { | 76 void* params) { |
76 client_->FileSelected(path); | 77 client_->FileSelected(path); |
77 delete this; | 78 delete this; |
78 } | 79 } |
(...skipping 17 matching lines...) Expand all Loading... |
96 } | 97 } |
97 | 98 |
98 // static | 99 // static |
99 void EntryPicker::StopSkippingPickerForTest() { | 100 void EntryPicker::StopSkippingPickerForTest() { |
100 g_skip_picker_for_test = false; | 101 g_skip_picker_for_test = false; |
101 } | 102 } |
102 | 103 |
103 } // namespace api | 104 } // namespace api |
104 | 105 |
105 } // namespace extensions | 106 } // namespace extensions |
OLD | NEW |