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

Side by Side Diff: content/browser/android/interstitial_page_delegate_android.h

Issue 629183002: Replacing the OVERRIDE with override and FINAL with final in content/browser/android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolving Error in android 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_BROWSER_ANDROID_INTERSTITIAL_PAGE_DELEGATE_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_INTERSTITIAL_PAGE_DELEGATE_ANDROID_H_
6 #define CONTENT_BROWSER_ANDROID_INTERSTITIAL_PAGE_DELEGATE_ANDROID_H_ 6 #define CONTENT_BROWSER_ANDROID_INTERSTITIAL_PAGE_DELEGATE_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 10
(...skipping 17 matching lines...) Expand all
28 const std::string& html_content); 28 const std::string& html_content);
29 virtual ~InterstitialPageDelegateAndroid(); 29 virtual ~InterstitialPageDelegateAndroid();
30 30
31 void set_interstitial_page(InterstitialPage* page) { page_ = page; } 31 void set_interstitial_page(InterstitialPage* page) { page_ = page; }
32 32
33 // Methods called from Java. 33 // Methods called from Java.
34 void Proceed(JNIEnv* env, jobject obj); 34 void Proceed(JNIEnv* env, jobject obj);
35 void DontProceed(JNIEnv* env, jobject obj); 35 void DontProceed(JNIEnv* env, jobject obj);
36 36
37 // Implementation of InterstitialPageDelegate 37 // Implementation of InterstitialPageDelegate
38 virtual std::string GetHTMLContents() OVERRIDE; 38 virtual std::string GetHTMLContents() override;
39 virtual void OnProceed() OVERRIDE; 39 virtual void OnProceed() override;
40 virtual void OnDontProceed() OVERRIDE; 40 virtual void OnDontProceed() override;
41 virtual void CommandReceived(const std::string& command) OVERRIDE; 41 virtual void CommandReceived(const std::string& command) override;
42 42
43 static bool RegisterInterstitialPageDelegateAndroid(JNIEnv* env); 43 static bool RegisterInterstitialPageDelegateAndroid(JNIEnv* env);
44 44
45 private: 45 private:
46 JavaObjectWeakGlobalRef weak_java_obj_; 46 JavaObjectWeakGlobalRef weak_java_obj_;
47 47
48 std::string html_content_; 48 std::string html_content_;
49 InterstitialPage* page_; // Owns this. 49 InterstitialPage* page_; // Owns this.
50 50
51 DISALLOW_COPY_AND_ASSIGN(InterstitialPageDelegateAndroid); 51 DISALLOW_COPY_AND_ASSIGN(InterstitialPageDelegateAndroid);
52 }; 52 };
53 53
54 } // namespace content 54 } // namespace content
55 55
56 #endif // CONTENT_BROWSER_ANDROID_INTERSTITIAL_PAGE_DELEGATE_ANDROID_H_ 56 #endif // CONTENT_BROWSER_ANDROID_INTERSTITIAL_PAGE_DELEGATE_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698