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

Side by Side Diff: content/shell/android/java/src/org/chromium/content_shell/Shell.java

Issue 2595263002: Introduce ViewRoot forwarding input/view events to native (Closed)
Patch Set: addressed comments Created 3 years, 11 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 package org.chromium.content_shell; 5 package org.chromium.content_shell;
6 6
7 import android.app.Activity; 7 import android.app.Activity;
8 import android.content.Context; 8 import android.content.Context;
9 import android.graphics.drawable.ClipDrawable; 9 import android.graphics.drawable.ClipDrawable;
10 import android.text.TextUtils; 10 import android.text.TextUtils;
(...skipping 19 matching lines...) Expand all
30 import org.chromium.content.browser.ContentVideoViewEmbedder; 30 import org.chromium.content.browser.ContentVideoViewEmbedder;
31 import org.chromium.content.browser.ContentView; 31 import org.chromium.content.browser.ContentView;
32 import org.chromium.content.browser.ContentViewClient; 32 import org.chromium.content.browser.ContentViewClient;
33 import org.chromium.content.browser.ContentViewCore; 33 import org.chromium.content.browser.ContentViewCore;
34 import org.chromium.content.browser.ContentViewRenderView; 34 import org.chromium.content.browser.ContentViewRenderView;
35 import org.chromium.content_public.browser.ActionModeCallbackHelper; 35 import org.chromium.content_public.browser.ActionModeCallbackHelper;
36 import org.chromium.content_public.browser.LoadUrlParams; 36 import org.chromium.content_public.browser.LoadUrlParams;
37 import org.chromium.content_public.browser.NavigationController; 37 import org.chromium.content_public.browser.NavigationController;
38 import org.chromium.content_public.browser.WebContents; 38 import org.chromium.content_public.browser.WebContents;
39 import org.chromium.ui.base.ViewAndroidDelegate; 39 import org.chromium.ui.base.ViewAndroidDelegate;
40 import org.chromium.ui.base.ViewRoot;
40 import org.chromium.ui.base.WindowAndroid; 41 import org.chromium.ui.base.WindowAndroid;
41 42
42 /** 43 /**
43 * Container for the various UI components that make up a shell window. 44 * Container for the various UI components that make up a shell window.
44 */ 45 */
45 @JNINamespace("content") 46 @JNINamespace("content")
46 public class Shell extends LinearLayout { 47 public class Shell extends LinearLayout {
47 48
48 private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200; 49 private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200;
49 50
50 private final Runnable mClearProgressRunnable = new Runnable() { 51 private final Runnable mClearProgressRunnable = new Runnable() {
51 @Override 52 @Override
52 public void run() { 53 public void run() {
53 mProgressDrawable.setLevel(0); 54 mProgressDrawable.setLevel(0);
54 } 55 }
55 }; 56 };
56 57
57 private ContentViewCore mContentViewCore; 58 private ContentViewCore mContentViewCore;
58 private WebContents mWebContents; 59 private WebContents mWebContents;
60 private ViewRoot mViewRoot;
59 private NavigationController mNavigationController; 61 private NavigationController mNavigationController;
60 private ContentViewClient mContentViewClient; 62 private ContentViewClient mContentViewClient;
61 private EditText mUrlTextView; 63 private EditText mUrlTextView;
62 private ImageButton mPrevButton; 64 private ImageButton mPrevButton;
63 private ImageButton mNextButton; 65 private ImageButton mNextButton;
64 private ImageButton mStopReloadButton; 66 private ImageButton mStopReloadButton;
65 67
66 private ClipDrawable mProgressDrawable; 68 private ClipDrawable mProgressDrawable;
67 69
68 private long mNativeShell; 70 private long mNativeShell;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 290
289 /** 291 /**
290 * Initializes the ContentView based on the native tab contents pointer pass ed in. 292 * Initializes the ContentView based on the native tab contents pointer pass ed in.
291 * @param webContents A {@link WebContents} object. 293 * @param webContents A {@link WebContents} object.
292 */ 294 */
293 @SuppressWarnings("unused") 295 @SuppressWarnings("unused")
294 @CalledByNative 296 @CalledByNative
295 private void initFromNativeTabContents(WebContents webContents) { 297 private void initFromNativeTabContents(WebContents webContents) {
296 Context context = getContext(); 298 Context context = getContext();
297 mContentViewCore = new ContentViewCore(context, ""); 299 mContentViewCore = new ContentViewCore(context, "");
300 mViewRoot = ViewRoot.create(mWindow);
298 ContentView cv = ContentView.createContentView(context, mContentViewCore ); 301 ContentView cv = ContentView.createContentView(context, mContentViewCore );
299 mContentViewCore.initialize(ViewAndroidDelegate.createBasicDelegate(cv), cv, 302 mContentViewCore.initialize(ViewAndroidDelegate.createBasicDelegate(cv), cv,
300 webContents, mWindow); 303 webContents, mWindow, mViewRoot);
301 mContentViewCore.setActionModeCallback(defaultActionCallback()); 304 mContentViewCore.setActionModeCallback(defaultActionCallback());
302 mContentViewCore.setContentViewClient(mContentViewClient); 305 mContentViewCore.setContentViewClient(mContentViewClient);
303 mWebContents = mContentViewCore.getWebContents(); 306 mWebContents = mContentViewCore.getWebContents();
304 mNavigationController = mWebContents.getNavigationController(); 307 mNavigationController = mWebContents.getNavigationController();
305 if (getParent() != null) mContentViewCore.onShow(); 308 if (getParent() != null) mContentViewCore.onShow();
306 if (mWebContents.getUrl() != null) { 309 if (mWebContents.getUrl() != null) {
307 mUrlTextView.setText(mWebContents.getUrl()); 310 mUrlTextView.setText(mWebContents.getUrl());
308 } 311 }
309 ((FrameLayout) findViewById(R.id.contentview_holder)).addView(cv, 312 ((FrameLayout) findViewById(R.id.contentview_holder)).addView(cv,
310 new FrameLayout.LayoutParams( 313 new FrameLayout.LayoutParams(
311 FrameLayout.LayoutParams.MATCH_PARENT, 314 FrameLayout.LayoutParams.MATCH_PARENT,
312 FrameLayout.LayoutParams.MATCH_PARENT)); 315 FrameLayout.LayoutParams.MATCH_PARENT));
313 cv.requestFocus(); 316 cv.requestFocus();
314 mContentViewRenderView.setCurrentContentViewCore(mContentViewCore); 317 mContentViewRenderView.setCurrentContent(mContentViewCore, mViewRoot);
315 } 318 }
316 319
317 /** 320 /**
318 * {link @ActionMode.Callback} that uses the default implementation in 321 * {link @ActionMode.Callback} that uses the default implementation in
319 * {@link SelectionPopupController}. 322 * {@link SelectionPopupController}.
320 */ 323 */
321 private ActionMode.Callback defaultActionCallback() { 324 private ActionMode.Callback defaultActionCallback() {
322 final ActionModeCallbackHelper helper = 325 final ActionModeCallbackHelper helper =
323 mContentViewCore.getActionModeCallbackHelper(); 326 mContentViewCore.getActionModeCallbackHelper();
324 327
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 360
358 @Override 361 @Override
359 public void exitFullscreenVideo() { 362 public void exitFullscreenVideo() {
360 super.exitFullscreenVideo(); 363 super.exitFullscreenVideo();
361 mContentViewRenderView.setOverlayVideoMode(false); 364 mContentViewRenderView.setOverlayVideoMode(false);
362 } 365 }
363 }; 366 };
364 } 367 }
365 368
366 /** 369 /**
370 * @return {@link ViewRoot} instance used to forward view/input events.
371 */
372 ViewRoot getViewRoot() {
373 return mViewRoot;
374 }
375
376 /**
367 * Enable/Disable navigation(Prev/Next) button if navigation is allowed/disa llowed 377 * Enable/Disable navigation(Prev/Next) button if navigation is allowed/disa llowed
368 * in respective direction. 378 * in respective direction.
369 * @param controlId Id of button to update 379 * @param controlId Id of button to update
370 * @param enabled enable/disable value 380 * @param enabled enable/disable value
371 */ 381 */
372 @CalledByNative 382 @CalledByNative
373 private void enableUiControl(int controlId, boolean enabled) { 383 private void enableUiControl(int controlId, boolean enabled) {
374 if (controlId == 0) { 384 if (controlId == 0) {
375 mPrevButton.setEnabled(enabled); 385 mPrevButton.setEnabled(enabled);
376 } else if (controlId == 1) { 386 } else if (controlId == 1) {
(...skipping 27 matching lines...) Expand all
404 Context.INPUT_METHOD_SERVICE); 414 Context.INPUT_METHOD_SERVICE);
405 if (visible) { 415 if (visible) {
406 imm.showSoftInput(mUrlTextView, InputMethodManager.SHOW_IMPLICIT); 416 imm.showSoftInput(mUrlTextView, InputMethodManager.SHOW_IMPLICIT);
407 } else { 417 } else {
408 imm.hideSoftInputFromWindow(mUrlTextView.getWindowToken(), 0); 418 imm.hideSoftInputFromWindow(mUrlTextView.getWindowToken(), 0);
409 } 419 }
410 } 420 }
411 421
412 private static native void nativeCloseShell(long shellPtr); 422 private static native void nativeCloseShell(long shellPtr);
413 } 423 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698