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

Side by Side Diff: content/public/android/java/src/org/chromium/content/browser/ContentView.java

Issue 131553003: Move Android TraceEvent interface to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put back content version of TraceEvent*.java as wrappers to ease cross repository commit Created 6 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.browser; 5 package org.chromium.content.browser;
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.content.res.Configuration; 9 import android.content.res.Configuration;
10 import android.graphics.Bitmap; 10 import android.graphics.Bitmap;
11 import android.graphics.Canvas; 11 import android.graphics.Canvas;
12 import android.graphics.Rect; 12 import android.graphics.Rect;
13 import android.os.Build; 13 import android.os.Build;
14 import android.util.AttributeSet; 14 import android.util.AttributeSet;
15 import android.view.KeyEvent; 15 import android.view.KeyEvent;
16 import android.view.MotionEvent; 16 import android.view.MotionEvent;
17 import android.view.View; 17 import android.view.View;
18 import android.view.accessibility.AccessibilityEvent; 18 import android.view.accessibility.AccessibilityEvent;
19 import android.view.accessibility.AccessibilityNodeInfo; 19 import android.view.accessibility.AccessibilityNodeInfo;
20 import android.view.inputmethod.EditorInfo; 20 import android.view.inputmethod.EditorInfo;
21 import android.view.inputmethod.InputConnection; 21 import android.view.inputmethod.InputConnection;
22 import android.widget.FrameLayout; 22 import android.widget.FrameLayout;
23 23
24 import com.google.common.annotations.VisibleForTesting; 24 import com.google.common.annotations.VisibleForTesting;
25 25
26 import org.chromium.content.common.TraceEvent; 26 import org.chromium.base.TraceEvent;
27 import org.chromium.ui.base.WindowAndroid; 27 import org.chromium.ui.base.WindowAndroid;
28 28
29 /** 29 /**
30 * The containing view for {@link ContentViewCore} that exists in the Android UI hierarchy and 30 * The containing view for {@link ContentViewCore} that exists in the Android UI hierarchy and
31 * exposes the various {@link View} functionality to it. 31 * exposes the various {@link View} functionality to it.
32 * 32 *
33 * TODO(joth): Remove any methods overrides from this class that were added for WebView 33 * TODO(joth): Remove any methods overrides from this class that were added for WebView
34 * compatibility. 34 * compatibility.
35 */ 35 */
36 public class ContentView extends FrameLayout 36 public class ContentView extends FrameLayout
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 781
782 @Override 782 @Override
783 public boolean super_awakenScrollBars(int startDelay, boolean invalidate) { 783 public boolean super_awakenScrollBars(int startDelay, boolean invalidate) {
784 return super.awakenScrollBars(startDelay, invalidate); 784 return super.awakenScrollBars(startDelay, invalidate);
785 } 785 }
786 786
787 //////////////////////////////////////////////////////////////////////////// /////////////////// 787 //////////////////////////////////////////////////////////////////////////// ///////////////////
788 // End Implementation of ContentViewCore.InternalAccessDelega te // 788 // End Implementation of ContentViewCore.InternalAccessDelega te //
789 //////////////////////////////////////////////////////////////////////////// /////////////////// 789 //////////////////////////////////////////////////////////////////////////// ///////////////////
790 } 790 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698