Commit 66030761 authored by Aurimas Liutikas's avatar Aurimas Liutikas

Switch ChromeShellActivity to extend ActionBarActivity.

We should have changed this when we switched to AppCompat theme.

BUG=None
R=tedchoc@chromium.org

Review URL: https://codereview.chromium.org/785233007

Cr-Commit-Position: refs/heads/master@{#308411}
parent 9a8d805a
...@@ -437,6 +437,8 @@ android_library("chrome_shell_test_java") { ...@@ -437,6 +437,8 @@ android_library("chrome_shell_test_java") {
"//chrome/test/android:chrome_java_test_support", "//chrome/test/android:chrome_java_test_support",
"//content/public/android:content_java", "//content/public/android:content_java",
"//content/public/test/android:content_java_test_support", "//content/public/test/android:content_java_test_support",
"//third_party/android_tools:android_support_v13_java",
"//third_party/android_tools:android_support_v7_appcompat_java",
"//ui/android:ui_java", "//ui/android:ui_java",
] ]
DEPRECATED_java_in_dir = "shell/javatests/src" DEPRECATED_java_in_dir = "shell/javatests/src"
...@@ -470,6 +472,8 @@ android_apk("chrome_sync_shell_test_apk") { ...@@ -470,6 +472,8 @@ android_apk("chrome_sync_shell_test_apk") {
"//content/public/test/android:content_java_test_support", "//content/public/test/android:content_java_test_support",
"//sync/android:sync_java", "//sync/android:sync_java",
"//sync:sync_java_test_support", "//sync:sync_java_test_support",
"//third_party/android_tools:android_support_v13_java",
"//third_party/android_tools:android_support_v7_appcompat_java",
] ]
apk_name = "ChromeSyncShellTest" apk_name = "ChromeSyncShellTest"
DEPRECATED_java_in_dir = "sync_shell/javatests/src" DEPRECATED_java_in_dir = "sync_shell/javatests/src"
......
...@@ -7,6 +7,7 @@ package org.chromium.chrome.shell; ...@@ -7,6 +7,7 @@ package org.chromium.chrome.shell;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
...@@ -52,7 +53,7 @@ import org.chromium.ui.base.WindowAndroid; ...@@ -52,7 +53,7 @@ import org.chromium.ui.base.WindowAndroid;
/** /**
* The {@link android.app.Activity} component of a basic test shell to test Chrome features. * The {@link android.app.Activity} component of a basic test shell to test Chrome features.
*/ */
public class ChromeShellActivity extends Activity implements AppMenuPropertiesDelegate { public class ChromeShellActivity extends ActionBarActivity implements AppMenuPropertiesDelegate {
private static final String TAG = "ChromeShellActivity"; private static final String TAG = "ChromeShellActivity";
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment