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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 virtual void RendererResponsive(content::WebContents* source) override; | 73 virtual void RendererResponsive(content::WebContents* source) override; |
74 virtual void DidNavigateToPendingEntry(content::WebContents* source) override; | 74 virtual void DidNavigateToPendingEntry(content::WebContents* source) override; |
75 virtual void WebContentsCreated(content::WebContents* source_contents, | 75 virtual void WebContentsCreated(content::WebContents* source_contents, |
76 int opener_render_frame_id, | 76 int opener_render_frame_id, |
77 const base::string16& frame_name, | 77 const base::string16& frame_name, |
78 const GURL& target_url, | 78 const GURL& target_url, |
79 content::WebContents* new_contents) override; | 79 content::WebContents* new_contents) override; |
80 virtual bool ShouldCreateWebContents( | 80 virtual bool ShouldCreateWebContents( |
81 content::WebContents* web_contents, | 81 content::WebContents* web_contents, |
82 int route_id, | 82 int route_id, |
| 83 int main_frame_route_id, |
83 WindowContainerType window_container_type, | 84 WindowContainerType window_container_type, |
84 const base::string16& frame_name, | 85 const base::string16& frame_name, |
85 const GURL& target_url, | 86 const GURL& target_url, |
86 const std::string& partition_id, | 87 const std::string& partition_id, |
87 content::SessionStorageNamespace* session_storage_namespace) override; | 88 content::SessionStorageNamespace* session_storage_namespace) override; |
88 virtual bool OnGoToEntryOffset(int offset) override; | 89 virtual bool OnGoToEntryOffset(int offset) override; |
89 virtual void CloseContents(content::WebContents* source) override; | 90 virtual void CloseContents(content::WebContents* source) override; |
90 virtual void MoveContents(content::WebContents* source, | 91 virtual void MoveContents(content::WebContents* source, |
91 const gfx::Rect& pos) override; | 92 const gfx::Rect& pos) override; |
92 virtual bool AddMessageToConsole(content::WebContents* source, | 93 virtual bool AddMessageToConsole(content::WebContents* source, |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 JavaObjectWeakGlobalRef weak_java_delegate_; | 127 JavaObjectWeakGlobalRef weak_java_delegate_; |
127 | 128 |
128 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_; | 129 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_; |
129 }; | 130 }; |
130 | 131 |
131 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); | 132 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); |
132 | 133 |
133 } // namespace web_contents_delegate_android | 134 } // namespace web_contents_delegate_android |
134 | 135 |
135 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI
D_H_ | 136 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI
D_H_ |
OLD | NEW |