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

Side by Side Diff: content/browser/android/web_contents_observer_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
« no previous file with comments | « content/browser/android/ui_resource_provider_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_WEB_CONTENTS_OBSERVER_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_
6 #define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_ 6 #define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
(...skipping 15 matching lines...) Expand all
26 public: 26 public:
27 WebContentsObserverAndroid(JNIEnv* env, 27 WebContentsObserverAndroid(JNIEnv* env,
28 jobject obj, 28 jobject obj,
29 WebContents* web_contents); 29 WebContents* web_contents);
30 virtual ~WebContentsObserverAndroid(); 30 virtual ~WebContentsObserverAndroid();
31 31
32 void Destroy(JNIEnv* env, jobject obj); 32 void Destroy(JNIEnv* env, jobject obj);
33 33
34 private: 34 private:
35 virtual void RenderProcessGone( 35 virtual void RenderProcessGone(
36 base::TerminationStatus termination_status) OVERRIDE; 36 base::TerminationStatus termination_status) override;
37 virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE; 37 virtual void DidStartLoading(RenderViewHost* render_view_host) override;
38 virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE; 38 virtual void DidStopLoading(RenderViewHost* render_view_host) override;
39 virtual void DidFailProvisionalLoad( 39 virtual void DidFailProvisionalLoad(
40 RenderFrameHost* render_frame_host, 40 RenderFrameHost* render_frame_host,
41 const GURL& validated_url, 41 const GURL& validated_url,
42 int error_code, 42 int error_code,
43 const base::string16& error_description) OVERRIDE; 43 const base::string16& error_description) override;
44 virtual void DidFailLoad(RenderFrameHost* render_frame_host, 44 virtual void DidFailLoad(RenderFrameHost* render_frame_host,
45 const GURL& validated_url, 45 const GURL& validated_url,
46 int error_code, 46 int error_code,
47 const base::string16& error_description) OVERRIDE; 47 const base::string16& error_description) override;
48 virtual void DidNavigateMainFrame(const LoadCommittedDetails& details, 48 virtual void DidNavigateMainFrame(const LoadCommittedDetails& details,
49 const FrameNavigateParams& params) OVERRIDE; 49 const FrameNavigateParams& params) override;
50 virtual void DidNavigateAnyFrame(const LoadCommittedDetails& details, 50 virtual void DidNavigateAnyFrame(const LoadCommittedDetails& details,
51 const FrameNavigateParams& params) OVERRIDE; 51 const FrameNavigateParams& params) override;
52 virtual void DidFirstVisuallyNonEmptyPaint() OVERRIDE; 52 virtual void DidFirstVisuallyNonEmptyPaint() override;
53 virtual void DidStartProvisionalLoadForFrame( 53 virtual void DidStartProvisionalLoadForFrame(
54 RenderFrameHost* render_frame_host, 54 RenderFrameHost* render_frame_host,
55 const GURL& validated_url, 55 const GURL& validated_url,
56 bool is_error_page, 56 bool is_error_page,
57 bool is_iframe_srcdoc) OVERRIDE; 57 bool is_iframe_srcdoc) override;
58 virtual void DidCommitProvisionalLoadForFrame( 58 virtual void DidCommitProvisionalLoadForFrame(
59 RenderFrameHost* render_frame_host, 59 RenderFrameHost* render_frame_host,
60 const GURL& url, 60 const GURL& url,
61 ui::PageTransition transition_type) OVERRIDE; 61 ui::PageTransition transition_type) override;
62 virtual void DidFinishLoad(RenderFrameHost* render_frame_host, 62 virtual void DidFinishLoad(RenderFrameHost* render_frame_host,
63 const GURL& validated_url) OVERRIDE; 63 const GURL& validated_url) override;
64 virtual void DocumentLoadedInFrame( 64 virtual void DocumentLoadedInFrame(
65 RenderFrameHost* render_frame_host) OVERRIDE; 65 RenderFrameHost* render_frame_host) override;
66 virtual void NavigationEntryCommitted( 66 virtual void NavigationEntryCommitted(
67 const LoadCommittedDetails& load_details) OVERRIDE; 67 const LoadCommittedDetails& load_details) override;
68 virtual void WebContentsDestroyed() OVERRIDE; 68 virtual void WebContentsDestroyed() override;
69 virtual void DidAttachInterstitialPage() OVERRIDE; 69 virtual void DidAttachInterstitialPage() override;
70 virtual void DidDetachInterstitialPage() OVERRIDE; 70 virtual void DidDetachInterstitialPage() override;
71 virtual void DidChangeThemeColor(SkColor color) OVERRIDE; 71 virtual void DidChangeThemeColor(SkColor color) override;
72 72
73 void DidFailLoadInternal(bool is_provisional_load, 73 void DidFailLoadInternal(bool is_provisional_load,
74 bool is_main_frame, 74 bool is_main_frame,
75 int error_code, 75 int error_code,
76 const base::string16& description, 76 const base::string16& description,
77 const GURL& url); 77 const GURL& url);
78 78
79 JavaObjectWeakGlobalRef weak_java_observer_; 79 JavaObjectWeakGlobalRef weak_java_observer_;
80 80
81 DISALLOW_COPY_AND_ASSIGN(WebContentsObserverAndroid); 81 DISALLOW_COPY_AND_ASSIGN(WebContentsObserverAndroid);
82 }; 82 };
83 83
84 bool RegisterWebContentsObserverAndroid(JNIEnv* env); 84 bool RegisterWebContentsObserverAndroid(JNIEnv* env);
85 } // namespace content 85 } // namespace content
86 86
87 #endif // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_ 87 #endif // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_
OLDNEW
« no previous file with comments | « content/browser/android/ui_resource_provider_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698