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 COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H
_ | 5 #ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H
_ |
6 #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H
_ | 6 #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H
_ |
7 | 7 |
8 #include "base/android/jni_helper.h" | 8 #include "base/android/jni_helper.h" |
9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 content::WebContents* source, | 55 content::WebContents* source, |
56 const content::OpenURLParams& params) OVERRIDE; | 56 const content::OpenURLParams& params) OVERRIDE; |
57 virtual content::ColorChooser* OpenColorChooser( | 57 virtual content::ColorChooser* OpenColorChooser( |
58 content::WebContents* source, | 58 content::WebContents* source, |
59 SkColor color, | 59 SkColor color, |
60 const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE; | 60 const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE; |
61 virtual void NavigationStateChanged(const content::WebContents* source, | 61 virtual void NavigationStateChanged(const content::WebContents* source, |
62 unsigned changed_flags) OVERRIDE; | 62 unsigned changed_flags) OVERRIDE; |
63 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; | 63 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; |
64 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; | 64 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; |
65 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; | 65 virtual void LoadingStateChanged(content::WebContents* source, |
| 66 bool to_different_document) OVERRIDE; |
66 virtual void LoadProgressChanged(content::WebContents* source, | 67 virtual void LoadProgressChanged(content::WebContents* source, |
67 double load_progress) OVERRIDE; | 68 double load_progress) OVERRIDE; |
68 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 69 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; |
69 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 70 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; |
70 virtual void CloseContents(content::WebContents* source) OVERRIDE; | 71 virtual void CloseContents(content::WebContents* source) OVERRIDE; |
71 virtual void MoveContents(content::WebContents* source, | 72 virtual void MoveContents(content::WebContents* source, |
72 const gfx::Rect& pos) OVERRIDE; | 73 const gfx::Rect& pos) OVERRIDE; |
73 virtual bool AddMessageToConsole(content::WebContents* source, | 74 virtual bool AddMessageToConsole(content::WebContents* source, |
74 int32 level, | 75 int32 level, |
75 const base::string16& message, | 76 const base::string16& message, |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 JavaObjectWeakGlobalRef weak_java_delegate_; | 109 JavaObjectWeakGlobalRef weak_java_delegate_; |
109 | 110 |
110 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_; | 111 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_; |
111 }; | 112 }; |
112 | 113 |
113 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); | 114 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); |
114 | 115 |
115 } // namespace web_contents_delegate_android | 116 } // namespace web_contents_delegate_android |
116 | 117 |
117 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI
D_H_ | 118 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI
D_H_ |
OLD | NEW |