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

Side by Side Diff: chrome/browser/android/chrome_web_contents_delegate_android.h

Issue 884213005: 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 (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 CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ 5 #ifndef CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_
6 #define CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ 6 #define CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 17 matching lines...) Expand all
28 namespace android { 28 namespace android {
29 29
30 // Chromium Android specific WebContentsDelegate. 30 // Chromium Android specific WebContentsDelegate.
31 // Should contain any WebContentsDelegate implementations required by 31 // Should contain any WebContentsDelegate implementations required by
32 // the Chromium Android port but not to be shared with WebView. 32 // the Chromium Android port but not to be shared with WebView.
33 class ChromeWebContentsDelegateAndroid 33 class ChromeWebContentsDelegateAndroid
34 : public web_contents_delegate_android::WebContentsDelegateAndroid, 34 : public web_contents_delegate_android::WebContentsDelegateAndroid,
35 public content::NotificationObserver { 35 public content::NotificationObserver {
36 public: 36 public:
37 ChromeWebContentsDelegateAndroid(JNIEnv* env, jobject obj); 37 ChromeWebContentsDelegateAndroid(JNIEnv* env, jobject obj);
38 virtual ~ChromeWebContentsDelegateAndroid(); 38 ~ChromeWebContentsDelegateAndroid() override;
39 39
40 virtual void LoadingStateChanged(content::WebContents* source, 40 void LoadingStateChanged(content::WebContents* source,
41 bool to_different_document) override; 41 bool to_different_document) override;
42 virtual void RunFileChooser(content::WebContents* web_contents, 42 void RunFileChooser(content::WebContents* web_contents,
43 const content::FileChooserParams& params) 43 const content::FileChooserParams& params) override;
44 override; 44 void CloseContents(content::WebContents* web_contents) override;
45 virtual void CloseContents(content::WebContents* web_contents) override; 45 void FindReply(content::WebContents* web_contents,
46 virtual void FindReply(content::WebContents* web_contents, 46 int request_id,
47 int request_id, 47 int number_of_matches,
48 int number_of_matches, 48 const gfx::Rect& selection_rect,
49 const gfx::Rect& selection_rect, 49 int active_match_ordinal,
50 int active_match_ordinal, 50 bool final_update) override;
51 bool final_update) override; 51 void FindMatchRectsReply(content::WebContents* web_contents,
52 virtual void FindMatchRectsReply(content::WebContents* web_contents, 52 int version,
53 int version, 53 const std::vector<gfx::RectF>& rects,
54 const std::vector<gfx::RectF>& rects, 54 const gfx::RectF& active_rect) override;
55 const gfx::RectF& active_rect) override; 55 content::JavaScriptDialogManager* GetJavaScriptDialogManager(
56 virtual content::JavaScriptDialogManager* 56 content::WebContents* source) override;
57 GetJavaScriptDialogManager(content::WebContents* source) override; 57 void RequestMediaAccessPermission(
58 virtual void RequestMediaAccessPermission(
59 content::WebContents* web_contents, 58 content::WebContents* web_contents,
60 const content::MediaStreamRequest& request, 59 const content::MediaStreamRequest& request,
61 const content::MediaResponseCallback& callback) override; 60 const content::MediaResponseCallback& callback) override;
62 virtual bool CheckMediaAccessPermission( 61 bool CheckMediaAccessPermission(content::WebContents* web_contents,
63 content::WebContents* web_contents, 62 const GURL& security_origin,
64 const GURL& security_origin, 63 content::MediaStreamType type) override;
65 content::MediaStreamType type) override; 64 bool RequestPpapiBrokerPermission(
66 virtual bool RequestPpapiBrokerPermission(
67 content::WebContents* web_contents, 65 content::WebContents* web_contents,
68 const GURL& url, 66 const GURL& url,
69 const base::FilePath& plugin_path, 67 const base::FilePath& plugin_path,
70 const base::Callback<void(bool)>& callback) override; 68 const base::Callback<void(bool)>& callback) override;
71 virtual content::WebContents* OpenURLFromTab( 69 content::WebContents* OpenURLFromTab(
72 content::WebContents* source, 70 content::WebContents* source,
73 const content::OpenURLParams& params) override; 71 const content::OpenURLParams& params) override;
74 virtual void AddNewContents(content::WebContents* source, 72 void AddNewContents(content::WebContents* source,
75 content::WebContents* new_contents, 73 content::WebContents* new_contents,
76 WindowOpenDisposition disposition, 74 WindowOpenDisposition disposition,
77 const gfx::Rect& initial_rect, 75 const gfx::Rect& initial_rect,
78 bool user_gesture, 76 bool user_gesture,
79 bool* was_blocked) override; 77 bool* was_blocked) override;
78
80 private: 79 private:
81 // NotificationObserver implementation. 80 // NotificationObserver implementation.
82 virtual void Observe(int type, 81 void Observe(int type,
83 const content::NotificationSource& source, 82 const content::NotificationSource& source,
84 const content::NotificationDetails& details) override; 83 const content::NotificationDetails& details) override;
85 84
86 void OnFindResultAvailable(content::WebContents* web_contents, 85 void OnFindResultAvailable(content::WebContents* web_contents,
87 const FindNotificationDetails* find_result); 86 const FindNotificationDetails* find_result);
88 87
89 content::NotificationRegistrar notification_registrar_; 88 content::NotificationRegistrar notification_registrar_;
90 }; 89 };
91 90
92 // Register the native methods through JNI. 91 // Register the native methods through JNI.
93 bool RegisterChromeWebContentsDelegateAndroid(JNIEnv* env); 92 bool RegisterChromeWebContentsDelegateAndroid(JNIEnv* env);
94 93
95 } // namespace android 94 } // namespace android
96 } // namespace chrome 95 } // namespace chrome
97 96
98 #endif // CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ 97 #endif // CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698