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

Side by Side Diff: chrome/browser/ui/android/infobars/infobar_android.h

Issue 900733003: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_ANDROID_H_ 5 #ifndef CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_ANDROID_H_
6 #define CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_ANDROID_H_ 6 #define CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_ANDROID_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
(...skipping 17 matching lines...) Expand all
28 ACTION_NONE = 0, 28 ACTION_NONE = 0,
29 // Confirm infobar 29 // Confirm infobar
30 ACTION_OK = 1, 30 ACTION_OK = 1,
31 ACTION_CANCEL = 2, 31 ACTION_CANCEL = 2,
32 // Translate infobar 32 // Translate infobar
33 ACTION_TRANSLATE = 3, 33 ACTION_TRANSLATE = 3,
34 ACTION_TRANSLATE_SHOW_ORIGINAL = 4, 34 ACTION_TRANSLATE_SHOW_ORIGINAL = 4,
35 }; 35 };
36 36
37 explicit InfoBarAndroid(scoped_ptr<infobars::InfoBarDelegate> delegate); 37 explicit InfoBarAndroid(scoped_ptr<infobars::InfoBarDelegate> delegate);
38 virtual ~InfoBarAndroid(); 38 ~InfoBarAndroid() override;
39 39
40 // InfoBar: 40 // InfoBar:
41 virtual base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar( 41 virtual base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
42 JNIEnv* env) = 0; 42 JNIEnv* env) = 0;
43 43
44 void set_java_infobar(const base::android::JavaRef<jobject>& java_info_bar); 44 void set_java_infobar(const base::android::JavaRef<jobject>& java_info_bar);
45 bool HasSetJavaInfoBar() const; 45 bool HasSetJavaInfoBar() const;
46 46
47 // Tells the Java-side counterpart of this InfoBar to point to the replacement 47 // Tells the Java-side counterpart of this InfoBar to point to the replacement
48 // InfoBar instead of this one. 48 // InfoBar instead of this one.
(...skipping 26 matching lines...) Expand all
75 private: 75 private:
76 base::android::ScopedJavaGlobalRef<jobject> java_info_bar_; 76 base::android::ScopedJavaGlobalRef<jobject> java_info_bar_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(InfoBarAndroid); 78 DISALLOW_COPY_AND_ASSIGN(InfoBarAndroid);
79 }; 79 };
80 80
81 // Registers the NativeInfoBar's native methods through JNI. 81 // Registers the NativeInfoBar's native methods through JNI.
82 bool RegisterNativeInfoBar(JNIEnv* env); 82 bool RegisterNativeInfoBar(JNIEnv* env);
83 83
84 #endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_ANDROID_H_ 84 #endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698