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

Side by Side Diff: content/browser/android/java/gin_java_bridge_dispatcher_host.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_
6 #define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_ 6 #define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 30 matching lines...) Expand all
41 virtual ~GinJavaBridgeDispatcherHost(); 41 virtual ~GinJavaBridgeDispatcherHost();
42 42
43 void AddNamedObject( 43 void AddNamedObject(
44 const std::string& name, 44 const std::string& name,
45 const base::android::JavaRef<jobject>& object, 45 const base::android::JavaRef<jobject>& object,
46 const base::android::JavaRef<jclass>& safe_annotation_clazz); 46 const base::android::JavaRef<jclass>& safe_annotation_clazz);
47 void RemoveNamedObject(const std::string& name); 47 void RemoveNamedObject(const std::string& name);
48 void SetAllowObjectContentsInspection(bool allow); 48 void SetAllowObjectContentsInspection(bool allow);
49 49
50 // WebContentsObserver 50 // WebContentsObserver
51 virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) OVERRIDE; 51 virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
52 virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) OVERRIDE; 52 virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
53 virtual void DocumentAvailableInMainFrame() OVERRIDE; 53 virtual void DocumentAvailableInMainFrame() override;
54 virtual bool OnMessageReceived(const IPC::Message& message, 54 virtual bool OnMessageReceived(const IPC::Message& message,
55 RenderFrameHost* render_frame_host) OVERRIDE; 55 RenderFrameHost* render_frame_host) override;
56 56
57 // GinJavaMethodInvocationHelper::DispatcherDelegate 57 // GinJavaMethodInvocationHelper::DispatcherDelegate
58 virtual JavaObjectWeakGlobalRef GetObjectWeakRef( 58 virtual JavaObjectWeakGlobalRef GetObjectWeakRef(
59 GinJavaBoundObject::ObjectID object_id) OVERRIDE; 59 GinJavaBoundObject::ObjectID object_id) override;
60 60
61 void OnGetMethods(RenderFrameHost* render_frame_host, 61 void OnGetMethods(RenderFrameHost* render_frame_host,
62 GinJavaBoundObject::ObjectID object_id, 62 GinJavaBoundObject::ObjectID object_id,
63 IPC::Message* reply_msg); 63 IPC::Message* reply_msg);
64 void OnHasMethod(RenderFrameHost* render_frame_host, 64 void OnHasMethod(RenderFrameHost* render_frame_host,
65 GinJavaBoundObject::ObjectID object_id, 65 GinJavaBoundObject::ObjectID object_id,
66 const std::string& method_name, 66 const std::string& method_name,
67 IPC::Message* reply_msg); 67 IPC::Message* reply_msg);
68 void OnInvokeMethod(RenderFrameHost* render_frame_host, 68 void OnInvokeMethod(RenderFrameHost* render_frame_host,
69 GinJavaBoundObject::ObjectID object_id, 69 GinJavaBoundObject::ObjectID object_id,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 // Only used on the UI thread. 117 // Only used on the UI thread.
118 typedef std::map<RenderFrameHost*, IPC::Message*> PendingReplyMap; 118 typedef std::map<RenderFrameHost*, IPC::Message*> PendingReplyMap;
119 PendingReplyMap pending_replies_; 119 PendingReplyMap pending_replies_;
120 120
121 DISALLOW_COPY_AND_ASSIGN(GinJavaBridgeDispatcherHost); 121 DISALLOW_COPY_AND_ASSIGN(GinJavaBridgeDispatcherHost);
122 }; 122 };
123 123
124 } // namespace content 124 } // namespace content
125 125
126 #endif // CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_ 126 #endif // CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698