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

Unified Diff: ui/shell_dialogs/select_file_dialog_android.cc

Issue 15704005: ui/shell_dialogs: Use base::string16 now that string16 was moved into base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « ui/shell_dialogs/select_file_dialog_android.h ('k') | ui/shell_dialogs/select_file_dialog_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/shell_dialogs/select_file_dialog_android.cc
diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc
index 6bed380d354721488e0680ad9c9639fbab03e6b2..1391651de435f0149f526d5c5f53b7f01eba57b8 100644
--- a/ui/shell_dialogs/select_file_dialog_android.cc
+++ b/ui/shell_dialogs/select_file_dialog_android.cc
@@ -19,7 +19,7 @@ namespace ui {
// static
SelectFileDialogImpl* SelectFileDialogImpl::Create(Listener* listener,
- ui::SelectFilePolicy* policy) {
+ SelectFilePolicy* policy) {
return new SelectFileDialogImpl(listener, policy);
}
@@ -52,8 +52,8 @@ void SelectFileDialogImpl::ListenerDestroyed() {
}
void SelectFileDialogImpl::SelectFileImpl(
- ui::SelectFileDialog::Type type,
- const string16& title,
+ SelectFileDialog::Type type,
+ const base::string16& title,
const base::FilePath& default_path,
const SelectFileDialog::FileTypeInfo* file_types,
int file_type_index,
@@ -63,9 +63,9 @@ void SelectFileDialogImpl::SelectFileImpl(
JNIEnv* env = base::android::AttachCurrentThread();
ScopedJavaLocalRef<jstring> capture_value;
- std::vector<string16> accept_types;
+ std::vector<base::string16> accept_types;
if (params) {
- accept_types = *(reinterpret_cast<std::vector<string16>*>(params));
+ accept_types = *(reinterpret_cast<std::vector<base::string16>*>(params));
// The last string in params is expected to be the string
// with capture value.
@@ -96,9 +96,8 @@ SelectFileDialogImpl::~SelectFileDialogImpl() {
}
SelectFileDialogImpl::SelectFileDialogImpl(Listener* listener,
- ui::SelectFilePolicy* policy)
- : ui::SelectFileDialog(listener, policy),
- is_running_(false) {
+ SelectFilePolicy* policy)
+ : SelectFileDialog(listener, policy), is_running_(false) {
JNIEnv* env = base::android::AttachCurrentThread();
java_object_.Reset(
Java_SelectFileDialog_create(env, reinterpret_cast<jint>(this)));
« no previous file with comments | « ui/shell_dialogs/select_file_dialog_android.h ('k') | ui/shell_dialogs/select_file_dialog_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698