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_weak_ref.h" | 8 #include "base/android/jni_weak_ref.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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 double load_progress) override; | 69 double load_progress) override; |
70 void RendererUnresponsive(content::WebContents* source) override; | 70 void RendererUnresponsive(content::WebContents* source) override; |
71 void RendererResponsive(content::WebContents* source) override; | 71 void RendererResponsive(content::WebContents* source) override; |
72 void WebContentsCreated(content::WebContents* source_contents, | 72 void WebContentsCreated(content::WebContents* source_contents, |
73 int opener_render_frame_id, | 73 int opener_render_frame_id, |
74 const std::string& frame_name, | 74 const std::string& frame_name, |
75 const GURL& target_url, | 75 const GURL& target_url, |
76 content::WebContents* new_contents) override; | 76 content::WebContents* new_contents) override; |
77 bool ShouldCreateWebContents( | 77 bool ShouldCreateWebContents( |
78 content::WebContents* web_contents, | 78 content::WebContents* web_contents, |
79 int route_id, | 79 int32 route_id, |
80 int main_frame_route_id, | 80 int32 main_frame_route_id, |
| 81 int32 main_frame_widget_route_id, |
| 82 int32 surface_id, |
81 WindowContainerType window_container_type, | 83 WindowContainerType window_container_type, |
82 const std::string& frame_name, | 84 const std::string& frame_name, |
83 const GURL& target_url, | 85 const GURL& target_url, |
84 const std::string& partition_id, | 86 const std::string& partition_id, |
85 content::SessionStorageNamespace* session_storage_namespace) override; | 87 content::SessionStorageNamespace* session_storage_namespace) override; |
86 bool OnGoToEntryOffset(int offset) override; | 88 bool OnGoToEntryOffset(int offset) override; |
87 void CloseContents(content::WebContents* source) override; | 89 void CloseContents(content::WebContents* source) override; |
88 void MoveContents(content::WebContents* source, | 90 void MoveContents(content::WebContents* source, |
89 const gfx::Rect& pos) override; | 91 const gfx::Rect& pos) override; |
90 bool AddMessageToConsole(content::WebContents* source, | 92 bool AddMessageToConsole(content::WebContents* source, |
(...skipping 30 matching lines...) Expand all Loading... |
121 JavaObjectWeakGlobalRef weak_java_delegate_; | 123 JavaObjectWeakGlobalRef weak_java_delegate_; |
122 | 124 |
123 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_; | 125 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_; |
124 }; | 126 }; |
125 | 127 |
126 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); | 128 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); |
127 | 129 |
128 } // namespace web_contents_delegate_android | 130 } // namespace web_contents_delegate_android |
129 | 131 |
130 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI
D_H_ | 132 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI
D_H_ |
OLD | NEW |