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

Unified Diff: ui/shell_dialogs/select_file_dialog_android.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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/platform_window/x11/x11_window.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.h
diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h
index a9d0d5432e7198965c4cd7c5aa8ad13cd1604ca4..90abdbb4b5fe835e8d41fb9f0cc9e1f3e6830b98 100644
--- a/ui/shell_dialogs/select_file_dialog_android.h
+++ b/ui/shell_dialogs/select_file_dialog_android.h
@@ -31,8 +31,8 @@ class SelectFileDialogImpl : public SelectFileDialog {
void OnFileNotSelected(JNIEnv* env, jobject java_object);
// From SelectFileDialog
- virtual bool IsRunning(gfx::NativeWindow) const OVERRIDE;
- virtual void ListenerDestroyed() OVERRIDE;
+ virtual bool IsRunning(gfx::NativeWindow) const override;
+ 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
@@ -45,7 +45,7 @@ class SelectFileDialogImpl : public SelectFileDialog {
int file_type_index,
const std::string& default_extension,
gfx::NativeWindow owning_window,
- void* params) OVERRIDE;
+ void* params) override;
static bool RegisterSelectFileDialog(JNIEnv* env);
@@ -55,7 +55,7 @@ class SelectFileDialogImpl : public SelectFileDialog {
private:
SelectFileDialogImpl(Listener* listener, SelectFilePolicy* policy);
- virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE;
+ virtual bool HasMultipleFileTypeChoicesImpl() override;
base::android::ScopedJavaGlobalRef<jobject> java_object_;
« no previous file with comments | « ui/platform_window/x11/x11_window.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