Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / android / shell / java / src / org / chromium / chrome / shell / ChromeShellActivity.java

diff --git a/src/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/src/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
index 335ce04..48627d2 100644 (file)
--- a/src/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
+++ b/src/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
@@ -13,15 +13,15 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Toast;
 
-import com.google.common.annotations.VisibleForTesting;
-
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.BaseSwitches;
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContentUriUtils;
 import org.chromium.base.MemoryPressureListener;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.chrome.browser.DevToolsServer;
 import org.chromium.chrome.browser.FileProviderHelper;
@@ -37,7 +37,6 @@ import org.chromium.content.browser.ActivityContentVideoViewClient;
 import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.DeviceUtils;
-import org.chromium.content.common.ContentSwitches;
 import org.chromium.printing.PrintManagerDelegateImpl;
 import org.chromium.printing.PrintingController;
 import org.chromium.sync.signin.AccountManagerHelper;
@@ -141,18 +140,14 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
             public boolean onShowCustomView(View view) {
                 if (mTabManager == null) return false;
                 boolean success = super.onShowCustomView(view);
-                if (!CommandLine.getInstance().hasSwitch(
-                        ContentSwitches.DISABLE_OVERLAY_FULLSCREEN_VIDEO_SUBTITLE)) {
-                    mTabManager.setOverlayVideoMode(true);
-                }
+                mTabManager.setOverlayVideoMode(true);
                 return success;
             }
 
             @Override
             public void onDestroyContentVideoView() {
                 super.onDestroyContentVideoView();
-                if (mTabManager != null && !CommandLine.getInstance().hasSwitch(
-                        ContentSwitches.DISABLE_OVERLAY_FULLSCREEN_VIDEO_SUBTITLE)) {
+                if (mTabManager != null) {
                     mTabManager.setOverlayVideoMode(false);
                 }
             }
@@ -167,7 +162,8 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
         mToolbar.setMenuHandler(mAppMenuHandler);
 
         mDevToolsServer = new DevToolsServer("chrome_shell");
-        mDevToolsServer.setRemoteDebuggingEnabled(true);
+        mDevToolsServer.setRemoteDebuggingEnabled(
+                true, DevToolsServer.Security.ALLOW_DEBUG_PERMISSION);
 
         mPrintingController = PrintingControllerFactory.create(this);
 
@@ -281,6 +277,7 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_MENU && event.getRepeatCount() == 0) {
+            if (mToolbar != null) mToolbar.hideSuggestions();
             mAppMenuHandler.showAppMenu(findViewById(R.id.menu_button), true, false);
             return true;
         }
@@ -291,6 +288,12 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         ChromeShellTab activeTab = getActiveTab();
+        if (activeTab != null) {
+            ViewGroup containerView = activeTab.getContentViewCore().getContainerView();
+            if (containerView.isFocusable() && containerView.isFocusableInTouchMode()) {
+                containerView.requestFocus();
+            }
+        }
         switch (item.getItemId()) {
             case R.id.signin:
                 if (ChromeSigninController.get(this).isSignedIn()) {