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

Unified Diff: chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java

Issue 184993005: Rename ChromiumTestShell classes to ChromeShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase yet again Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java
deleted file mode 100644
index f82d707bcf6e99a0ed89f7fa81409aea337d7c2e..0000000000000000000000000000000000000000
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright 2014 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.shell;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.res.TypedArray;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-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.MemoryPressureListener;
-import org.chromium.base.library_loader.ProcessInitException;
-import org.chromium.chrome.browser.DevToolsServer;
-import org.chromium.chrome.browser.appmenu.AppMenuHandler;
-import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
-import org.chromium.chrome.browser.printing.PrintingControllerFactory;
-import org.chromium.chrome.browser.printing.TabPrinter;
-import org.chromium.chrome.shell.sync.SyncController;
-import org.chromium.content.browser.ActivityContentVideoViewClient;
-import org.chromium.content.browser.BrowserStartupController;
-import org.chromium.content.browser.ContentView;
-import org.chromium.content.browser.DeviceUtils;
-import org.chromium.printing.PrintingController;
-import org.chromium.sync.signin.ChromeSigninController;
-import org.chromium.ui.base.ActivityWindowAndroid;
-import org.chromium.ui.base.WindowAndroid;
-
-/**
- * The {@link android.app.Activity} component of a basic test shell to test Chrome features.
- */
-public class ChromiumTestShellActivity extends Activity implements AppMenuPropertiesDelegate {
- private static final String TAG = "ChromiumTestShellActivity";
-
- private WindowAndroid mWindow;
- private TabManager mTabManager;
- private DevToolsServer mDevToolsServer;
- private SyncController mSyncController;
- private PrintingController mPrintingController;
-
- private AppMenuHandler mAppMenuHandler;
-
- @Override
- protected void onCreate(final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- ChromiumTestShellApplication.initCommandLine();
- waitForDebuggerIfNeeded();
-
- DeviceUtils.addDeviceSpecificUserAgentSwitch(this);
-
- BrowserStartupController.StartupCallback callback =
- new BrowserStartupController.StartupCallback() {
- @Override
- public void onSuccess(boolean alreadyStarted) {
- finishInitialization(savedInstanceState);
- }
-
- @Override
- public void onFailure() {
- Toast.makeText(ChromiumTestShellActivity.this,
- R.string.browser_process_initialization_failed,
- Toast.LENGTH_SHORT).show();
- Log.e(TAG, "Chromium browser process initialization failed");
- finish();
- }
- };
- try {
- BrowserStartupController.get(this).startBrowserProcessesAsync(callback);
- }
- catch (ProcessInitException e) {
- Log.e(TAG, "Unable to load native library.", e);
- System.exit(-1);
- }
- }
-
- private void finishInitialization(final Bundle savedInstanceState) {
- setContentView(R.layout.testshell_activity);
- mTabManager = (TabManager) findViewById(R.id.tab_manager);
-
- mWindow = new ActivityWindowAndroid(this);
- mWindow.restoreInstanceState(savedInstanceState);
- mTabManager.initialize(mWindow, new ActivityContentVideoViewClient(this));
-
- String startupUrl = getUrlFromIntent(getIntent());
- if (!TextUtils.isEmpty(startupUrl)) {
- mTabManager.setStartupUrl(startupUrl);
- }
- TestShellToolbar mToolbar = (TestShellToolbar) findViewById(R.id.toolbar);
- mAppMenuHandler = new AppMenuHandler(this, this, R.menu.main_menu);
- mToolbar.setMenuHandler(mAppMenuHandler);
-
- mDevToolsServer = new DevToolsServer("chromium_testshell");
- mDevToolsServer.setRemoteDebuggingEnabled(true);
-
- mPrintingController = PrintingControllerFactory.create(this);
-
- mSyncController = SyncController.get(this);
- // In case this method is called after the first onStart(), we need to inform the
- // SyncController that we have started.
- mSyncController.onStart();
- }
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
-
- if (mDevToolsServer != null) mDevToolsServer.destroy();
- mDevToolsServer = null;
- }
-
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- // TODO(dtrainor): Save/restore the tab state.
- if (mWindow != null) mWindow.saveInstanceState(outState);
- }
-
- @Override
- public boolean onKeyUp(int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_BACK) {
- TestShellTab tab = getActiveTab();
- if (tab != null && tab.getContentView().canGoBack()) {
- tab.getContentView().goBack();
- return true;
- }
- }
-
- return super.onKeyUp(keyCode, event);
- }
-
- @Override
- protected void onNewIntent(Intent intent) {
- if (MemoryPressureListener.handleDebugIntent(this, intent.getAction())) return;
-
- String url = getUrlFromIntent(intent);
- if (!TextUtils.isEmpty(url)) {
- TestShellTab tab = getActiveTab();
- if (tab != null) tab.loadUrlWithSanitization(url);
- }
- }
-
- @Override
- protected void onStop() {
- super.onStop();
-
- ContentView view = getActiveContentView();
- if (view != null) view.onHide();
- }
-
- @Override
- protected void onStart() {
- super.onStart();
-
- ContentView view = getActiveContentView();
- if (view != null) view.onShow();
-
- if (mSyncController != null) {
- mSyncController.onStart();
- }
- }
-
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- mWindow.onActivityResult(requestCode, resultCode, data);
- }
-
- /**
- * @return The {@link WindowAndroid} associated with this activity.
- */
- public WindowAndroid getWindowAndroid() {
- return mWindow;
- }
-
- /**
- * @return The {@link TestShellTab} that is currently visible.
- */
- public TestShellTab getActiveTab() {
- return mTabManager != null ? mTabManager.getCurrentTab() : null;
- }
-
- /**
- * @return The ContentView of the active tab.
- */
- public ContentView getActiveContentView() {
- TestShellTab tab = getActiveTab();
- return tab != null ? tab.getContentView() : null;
- }
-
- /**
- * Creates a {@link TestShellTab} with a URL specified by {@code url}.
- *
- * @param url The URL the new {@link TestShellTab} should start with.
- */
- @VisibleForTesting
- public void createTab(String url) {
- mTabManager.createTab(url);
- }
-
- /**
- * Override the menu key event to show AppMenu.
- */
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_MENU && event.getRepeatCount() == 0) {
- mAppMenuHandler.showAppMenu(findViewById(R.id.menu_button), true, false);
- return true;
- }
- return super.onKeyDown(keyCode, event);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.signin:
- if (ChromeSigninController.get(this).isSignedIn())
- SyncController.openSignOutDialog(getFragmentManager());
- else
- SyncController.openSigninDialog(getFragmentManager());
- return true;
- case R.id.print:
- if (getActiveTab() != null) {
- mPrintingController.startPrint(new TabPrinter(getActiveTab()));
- }
- return true;
- case R.id.back_menu_id:
- if (getActiveTab().canGoBack()) getActiveTab().goBack();
- return true;
- case R.id.forward_menu_id:
- if (getActiveTab().canGoForward()) getActiveTab().goForward();
- return true;
- default:
- return super.onOptionsItemSelected(item);
- }
- }
-
- private void waitForDebuggerIfNeeded() {
- if (CommandLine.getInstance().hasSwitch(BaseSwitches.WAIT_FOR_JAVA_DEBUGGER)) {
- Log.e(TAG, "Waiting for Java debugger to connect...");
- android.os.Debug.waitForDebugger();
- Log.e(TAG, "Java debugger connected. Resuming execution.");
- }
- }
-
- private static String getUrlFromIntent(Intent intent) {
- return intent != null ? intent.getDataString() : null;
- }
-
- @Override
- public boolean shouldShowAppMenu() {
- return true;
- }
-
- @Override
- public void prepareMenu(Menu menu) {
- // Disable the "Back" menu item if there is no page to go to.
- MenuItem backMenuItem = menu.findItem(R.id.back_menu_id);
- backMenuItem.setEnabled(getActiveTab().canGoBack());
-
- // Disable the "Forward" menu item if there is no page to go to.
- MenuItem forwardMenuItem = menu.findItem(R.id.forward_menu_id);
- forwardMenuItem.setEnabled(getActiveTab().canGoForward());
-
- // ChromiumTestShell does not know about bookmarks yet
- menu.findItem(R.id.bookmark_this_page_id).setEnabled(false);
-
- MenuItem signinItem = menu.findItem(R.id.signin);
- if (ChromeSigninController.get(this).isSignedIn()) {
- signinItem.setTitle(ChromeSigninController.get(this).getSignedInAccountName());
- } else {
- signinItem.setTitle(R.string.signin_sign_in);
- }
-
- menu.findItem(R.id.print).setVisible(ApiCompatibilityUtils.isPrintingSupported());
-
- menu.setGroupVisible(R.id.MAIN_MENU, true);
- }
-
- @Override
- public boolean shouldShowIconRow() {
- return true;
- }
-
- @Override
- public int getMenuThemeResourceId() {
- return android.R.style.Theme_Holo_Light;
- }
-
- @Override
- public int getItemRowHeight() {
- TypedArray a = obtainStyledAttributes(
- new int[] {android.R.attr.listPreferredItemHeightSmall});
- int itemRowHeight = a.getDimensionPixelSize(0, 0);
- a.recycle();
- return itemRowHeight;
- }
-}

Powered by Google App Engine
This is Rietveld 408576698