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

Side by Side Diff: chrome/browser/ui/android/infobars/infobar_container_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_CONTAINER_ANDROID_H_ 5 #ifndef CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_CONTAINER_ANDROID_H_
6 #define CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_CONTAINER_ANDROID_H_ 6 #define CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_CONTAINER_ANDROID_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 13 matching lines...) Expand all
24 public: 24 public:
25 InfoBarContainerAndroid(JNIEnv* env, 25 InfoBarContainerAndroid(JNIEnv* env,
26 jobject infobar_container); 26 jobject infobar_container);
27 void Destroy(JNIEnv* env, jobject obj); 27 void Destroy(JNIEnv* env, jobject obj);
28 28
29 JavaObjectWeakGlobalRef java_container() const { 29 JavaObjectWeakGlobalRef java_container() const {
30 return weak_java_infobar_container_; 30 return weak_java_infobar_container_;
31 } 31 }
32 32
33 private: 33 private:
34 virtual ~InfoBarContainerAndroid() override; 34 ~InfoBarContainerAndroid() override;
35 35
36 // InfobarContainer: 36 // InfobarContainer:
37 virtual void PlatformSpecificAddInfoBar(infobars::InfoBar* infobar, 37 void PlatformSpecificAddInfoBar(infobars::InfoBar* infobar,
38 size_t position) override; 38 size_t position) override;
39 virtual void PlatformSpecificRemoveInfoBar(infobars::InfoBar* infobar) 39 void PlatformSpecificRemoveInfoBar(infobars::InfoBar* infobar) override;
40 override; 40 void PlatformSpecificReplaceInfoBar(infobars::InfoBar* old_infobar,
41 virtual void PlatformSpecificReplaceInfoBar( 41 infobars::InfoBar* new_infobar) override;
42 infobars::InfoBar* old_infobar,
43 infobars::InfoBar* new_infobar) override;
44 42
45 // Create the Java equivalent of |android_bar| and add it to the java 43 // Create the Java equivalent of |android_bar| and add it to the java
46 // container. 44 // container.
47 void AttachJavaInfoBar(InfoBarAndroid* android_bar); 45 void AttachJavaInfoBar(InfoBarAndroid* android_bar);
48 46
49 // We're owned by the java infobar, need to use a weak ref so it can destroy 47 // We're owned by the java infobar, need to use a weak ref so it can destroy
50 // us. 48 // us.
51 JavaObjectWeakGlobalRef weak_java_infobar_container_; 49 JavaObjectWeakGlobalRef weak_java_infobar_container_;
52 50
53 DISALLOW_COPY_AND_ASSIGN(InfoBarContainerAndroid); 51 DISALLOW_COPY_AND_ASSIGN(InfoBarContainerAndroid);
54 }; 52 };
55 53
56 // Registers the InfoBarContainer's native methods through JNI. 54 // Registers the InfoBarContainer's native methods through JNI.
57 bool RegisterInfoBarContainer(JNIEnv* env); 55 bool RegisterInfoBarContainer(JNIEnv* env);
58 56
59 #endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_CONTAINER_ANDROID_H_ 57 #endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_CONTAINER_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/infobars/infobar_android.h ('k') | chrome/browser/ui/android/infobars/translate_infobar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698