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

Side by Side Diff: components/web_contents_delegate_android/web_contents_delegate_android.h

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 1 month 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 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 double load_progress) override; 68 double load_progress) override;
69 void RendererUnresponsive(content::WebContents* source) override; 69 void RendererUnresponsive(content::WebContents* source) override;
70 void RendererResponsive(content::WebContents* source) override; 70 void RendererResponsive(content::WebContents* source) override;
71 void WebContentsCreated(content::WebContents* source_contents, 71 void WebContentsCreated(content::WebContents* source_contents,
72 int opener_render_frame_id, 72 int opener_render_frame_id,
73 const std::string& frame_name, 73 const std::string& frame_name,
74 const GURL& target_url, 74 const GURL& target_url,
75 content::WebContents* new_contents) override; 75 content::WebContents* new_contents) override;
76 bool ShouldCreateWebContents( 76 bool ShouldCreateWebContents(
77 content::WebContents* web_contents, 77 content::WebContents* web_contents,
78 int route_id, 78 int32_t route_id,
79 int main_frame_route_id, 79 int32_t main_frame_route_id,
80 int32_t main_frame_widget_route_id,
80 WindowContainerType window_container_type, 81 WindowContainerType window_container_type,
81 const std::string& frame_name, 82 const std::string& frame_name,
82 const GURL& target_url, 83 const GURL& target_url,
83 const std::string& partition_id, 84 const std::string& partition_id,
84 content::SessionStorageNamespace* session_storage_namespace) override; 85 content::SessionStorageNamespace* session_storage_namespace) override;
85 bool OnGoToEntryOffset(int offset) override; 86 bool OnGoToEntryOffset(int offset) override;
86 void CloseContents(content::WebContents* source) override; 87 void CloseContents(content::WebContents* source) override;
87 void MoveContents(content::WebContents* source, 88 void MoveContents(content::WebContents* source,
88 const gfx::Rect& pos) override; 89 const gfx::Rect& pos) override;
89 bool AddMessageToConsole(content::WebContents* source, 90 bool AddMessageToConsole(content::WebContents* source,
(...skipping 30 matching lines...) Expand all
120 JavaObjectWeakGlobalRef weak_java_delegate_; 121 JavaObjectWeakGlobalRef weak_java_delegate_;
121 122
122 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_; 123 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_;
123 }; 124 };
124 125
125 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); 126 bool RegisterWebContentsDelegateAndroid(JNIEnv* env);
126 127
127 } // namespace web_contents_delegate_android 128 } // namespace web_contents_delegate_android
128 129
129 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI D_H_ 130 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI D_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698