OLD | NEW |
---|---|
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" |
11 #include "components/web_contents_delegate_android/web_contents_delegate_android .h" | 11 #include "components/web_contents_delegate_android/web_contents_delegate_android .h" |
12 #include "content/public/browser/bluetooth_chooser.h" | |
12 #include "content/public/browser/notification_observer.h" | 13 #include "content/public/browser/notification_observer.h" |
13 #include "content/public/browser/notification_registrar.h" | 14 #include "content/public/browser/notification_registrar.h" |
14 | 15 |
15 class FindNotificationDetails; | 16 class FindNotificationDetails; |
16 | 17 |
17 namespace content { | 18 namespace content { |
18 struct FileChooserParams; | 19 struct FileChooserParams; |
19 class WebContents; | 20 class WebContents; |
20 } | 21 } |
21 | 22 |
(...skipping 12 matching lines...) Expand all Loading... | |
34 : public web_contents_delegate_android::WebContentsDelegateAndroid, | 35 : public web_contents_delegate_android::WebContentsDelegateAndroid, |
35 public content::NotificationObserver { | 36 public content::NotificationObserver { |
36 public: | 37 public: |
37 ChromeWebContentsDelegateAndroid(JNIEnv* env, jobject obj); | 38 ChromeWebContentsDelegateAndroid(JNIEnv* env, jobject obj); |
38 ~ChromeWebContentsDelegateAndroid() override; | 39 ~ChromeWebContentsDelegateAndroid() override; |
39 | 40 |
40 void LoadingStateChanged(content::WebContents* source, | 41 void LoadingStateChanged(content::WebContents* source, |
41 bool to_different_document) override; | 42 bool to_different_document) override; |
42 void RunFileChooser(content::WebContents* web_contents, | 43 void RunFileChooser(content::WebContents* web_contents, |
43 const content::FileChooserParams& params) override; | 44 const content::FileChooserParams& params) override; |
45 scoped_ptr<content::BluetoothChooser> RunBluetoothChooser( | |
newt (away)
2015/09/01 21:51:23
does this method belong in this class?
Finnur
2015/09/02 16:01:43
I struggled with this quite a bit, and believe it
newt (away)
2015/09/02 17:48:42
Ok, if you're overriding a method in web_contents_
| |
46 content::WebContents* web_contents, | |
47 const content::BluetoothChooser::EventHandler& event_handler, | |
48 const GURL& origin) override; | |
44 void CloseContents(content::WebContents* web_contents) override; | 49 void CloseContents(content::WebContents* web_contents) override; |
45 blink::WebDisplayMode GetDisplayMode( | 50 blink::WebDisplayMode GetDisplayMode( |
46 const content::WebContents* web_contents) const override; | 51 const content::WebContents* web_contents) const override; |
47 void FindReply(content::WebContents* web_contents, | 52 void FindReply(content::WebContents* web_contents, |
48 int request_id, | 53 int request_id, |
49 int number_of_matches, | 54 int number_of_matches, |
50 const gfx::Rect& selection_rect, | 55 const gfx::Rect& selection_rect, |
51 int active_match_ordinal, | 56 int active_match_ordinal, |
52 bool final_update) override; | 57 bool final_update) override; |
53 void FindMatchRectsReply(content::WebContents* web_contents, | 58 void FindMatchRectsReply(content::WebContents* web_contents, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
91 content::NotificationRegistrar notification_registrar_; | 96 content::NotificationRegistrar notification_registrar_; |
92 }; | 97 }; |
93 | 98 |
94 // Register the native methods through JNI. | 99 // Register the native methods through JNI. |
95 bool RegisterChromeWebContentsDelegateAndroid(JNIEnv* env); | 100 bool RegisterChromeWebContentsDelegateAndroid(JNIEnv* env); |
96 | 101 |
97 } // namespace android | 102 } // namespace android |
98 } // namespace chrome | 103 } // namespace chrome |
99 | 104 |
100 #endif // CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ | 105 #endif // CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ |
OLD | NEW |