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

Side by Side Diff: content/browser/web_contents/web_contents_android.h

Issue 894003005: Revert "Load web contents after tab is created." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/browser/web_contents/web_contents_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 void EvaluateJavaScript(JNIEnv* env, 102 void EvaluateJavaScript(JNIEnv* env,
103 jobject obj, 103 jobject obj,
104 jstring script, 104 jstring script,
105 jobject callback); 105 jobject callback);
106 106
107 void AddMessageToDevToolsConsole(JNIEnv* env, 107 void AddMessageToDevToolsConsole(JNIEnv* env,
108 jobject jobj, 108 jobject jobj,
109 jint level, 109 jint level,
110 jstring message); 110 jstring message);
111 111
112 void OpenURL(JNIEnv* env,
113 jobject jobj,
114 jstring url,
115 jboolean user_gesture,
116 jboolean is_renderer_initiated);
117
118 private: 112 private:
119 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid(); 113 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid();
120 114
121 WebContents* web_contents_; 115 WebContents* web_contents_;
122 NavigationControllerAndroid navigation_controller_; 116 NavigationControllerAndroid navigation_controller_;
123 base::android::ScopedJavaGlobalRef<jobject> obj_; 117 base::android::ScopedJavaGlobalRef<jobject> obj_;
124 118
125 base::WeakPtrFactory<WebContentsAndroid> weak_factory_; 119 base::WeakPtrFactory<WebContentsAndroid> weak_factory_;
126 120
127 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid); 121 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid);
128 }; 122 };
129 123
130 } // namespace content 124 } // namespace content
131 125
132 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 126 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/browser/web_contents/web_contents_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698