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

Side by Side Diff: chrome/browser/android/document/document_web_contents_delegate.cc

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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "chrome/browser/android/document/document_web_contents_delegate.h" 5 #include "chrome/browser/android/document/document_web_contents_delegate.h"
6 6
7 #include "components/web_contents_delegate_android/web_contents_delegate_android .h" 7 #include "components/web_contents_delegate_android/web_contents_delegate_android .h"
8 #include "content/public/browser/web_contents.h" 8 #include "content/public/browser/web_contents.h"
9 #include "jni/DocumentWebContentsDelegate_jni.h" 9 #include "jni/DocumentWebContentsDelegate_jni.h"
10 10
(...skipping 26 matching lines...) Expand all
37 bool* was_blocked) { 37 bool* was_blocked) {
38 NOTREACHED(); 38 NOTREACHED();
39 } 39 }
40 40
41 void DocumentWebContentsDelegate::CloseContents(content::WebContents* source) { 41 void DocumentWebContentsDelegate::CloseContents(content::WebContents* source) {
42 NOTREACHED(); 42 NOTREACHED();
43 } 43 }
44 44
45 bool DocumentWebContentsDelegate::ShouldCreateWebContents( 45 bool DocumentWebContentsDelegate::ShouldCreateWebContents(
46 content::WebContents* web_contents, 46 content::WebContents* web_contents,
47 int route_id, 47 int32_t route_id,
48 int main_frame_route_id, 48 int32_t main_frame_route_id,
49 int32_t main_frame_widget_route_id,
49 WindowContainerType window_container_type, 50 WindowContainerType window_container_type,
50 const std::string& frame_name, 51 const std::string& frame_name,
51 const GURL& target_url, 52 const GURL& target_url,
52 const std::string& partition_id, 53 const std::string& partition_id,
53 content::SessionStorageNamespace* session_storage_namespace) { 54 content::SessionStorageNamespace* session_storage_namespace) {
54 NOTREACHED(); 55 NOTREACHED();
55 return false; 56 return false;
56 } 57 }
57 58
58 static jlong Initialize(JNIEnv* env, const JavaParamRef<jobject>& obj) { 59 static jlong Initialize(JNIEnv* env, const JavaParamRef<jobject>& obj) {
59 return reinterpret_cast<intptr_t>(new DocumentWebContentsDelegate(env, obj)); 60 return reinterpret_cast<intptr_t>(new DocumentWebContentsDelegate(env, obj));
60 } 61 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698