Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NativePageRootFrameLayout.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NativePageRootFrameLayout.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NativePageRootFrameLayout.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NativePageRootFrameLayout.java
deleted file mode 100644
index 22454ffd1b9c032e0912b2fd97b22d8d1116462c..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NativePageRootFrameLayout.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.ntp;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
-import android.widget.FrameLayout;
-
-/**
- * Basic functionality to needed for FrameLayouts used as the root view of NativePages.
- */
-public class NativePageRootFrameLayout extends FrameLayout {
-    /**
-     * Constructor for inflating from XML.
-     */
-    public NativePageRootFrameLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        // Fixes lanscape transitions when unfocusing the URL bar: crbug.com/288546
-        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN;
-        return super.onCreateInputConnection(outAttrs);
-    }
-}