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

Unified Diff: ui/shell_dialogs/select_file_dialog_android.h

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.cc ('k') | ui/shell_dialogs/select_file_dialog_android.cc » ('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.h
diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h
index e31d3b3d557479850c117790ddb53f92a3bf1921..911dc483ed6b73ba72a34037996714867f4cd279 100644
--- a/ui/shell_dialogs/select_file_dialog_android.h
+++ b/ui/shell_dialogs/select_file_dialog_android.h
@@ -13,11 +13,10 @@
namespace ui {
-class SelectFileDialogImpl : public ui::SelectFileDialog {
+class SelectFileDialogImpl : public SelectFileDialog {
public:
- static SelectFileDialogImpl* Create(
- Listener* listener,
- ui::SelectFilePolicy* policy);
+ static SelectFileDialogImpl* Create(Listener* listener,
+ SelectFilePolicy* policy);
void OnFileSelected(JNIEnv* env, jobject java_object, jstring filepath);
void OnFileNotSelected(JNIEnv* env, jobject java_object);
@@ -27,13 +26,13 @@ class SelectFileDialogImpl : public ui::SelectFileDialog {
virtual void ListenerDestroyed() OVERRIDE;
// Called when it is time to display the file picker.
- // params is expected to be a Vector<string16> with accept_types first and
+ // params is expected to be a vector<string16> with accept_types first and
// the capture value as the last element of the vector.
virtual void SelectFileImpl(
- ui::SelectFileDialog::Type type,
- const string16& title,
+ SelectFileDialog::Type type,
+ const base::string16& title,
const base::FilePath& default_path,
- const ui::SelectFileDialog::FileTypeInfo* file_types,
+ const SelectFileDialog::FileTypeInfo* file_types,
int file_type_index,
const std::string& default_extension,
gfx::NativeWindow owning_window,
@@ -45,7 +44,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog {
virtual ~SelectFileDialogImpl();
private:
- SelectFileDialogImpl(Listener* listener, ui::SelectFilePolicy* policy);
+ SelectFileDialogImpl(Listener* listener, SelectFilePolicy* policy);
virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE;
« no previous file with comments | « ui/shell_dialogs/select_file_dialog.cc ('k') | ui/shell_dialogs/select_file_dialog_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698