Remove Chrome for TV code.

BUG=334126 Review URL: https://codereview.chromium.org/136343002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245449 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Jan 17, 2014 · 693f63c · 693f63c
1 parent 8d5ded6
commit 693f63c
Show file tree

Hide file tree

Showing 45 changed files with 25 additions and 1,535 deletions.
diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc
@@ -24,20 +24,13 @@
 #include "base/message_loop/message_pump_android.h"
 #include "base/power_monitor/power_monitor_device_source_android.h"
 
-#if defined(GOOGLE_TV)
-#include "base/android/context_types.h"
-#endif
-
 namespace base {
 namespace android {
 
 static RegistrationMethod kBaseRegisteredMethods[] = {
   { "ActivityStatus", base::android::ActivityStatus::RegisterBindings },
   { "BuildInfo", base::android::BuildInfo::RegisterBindings },
   { "CommandLine", base::android::RegisterCommandLine },
-#if defined(GOOGLE_TV)
-  { "ContextTypes", base::android::RegisterContextTypes },
-#endif
   { "ContentUriUtils", base::RegisterContentUriUtils },
   { "CpuFeatures", base::android::RegisterCpuFeatures },
   { "ImportantFileWriterAndroid",

diff --git a/base/android/context_types.cc b/base/android/context_types.cc
diff --git a/base/android/context_types.h b/base/android/context_types.h
diff --git a/base/android/java/src/org/chromium/base/ContextTypes.java b/base/android/java/src/org/chromium/base/ContextTypes.java
diff --git a/base/android/java/src/org/chromium/base/PathUtils.java b/base/android/java/src/org/chromium/base/PathUtils.java
@@ -8,16 +8,12 @@
 import android.content.pm.ApplicationInfo;
 import android.os.Environment;
 
-import java.io.File;
-
 /**
  * This class provides the path related methods for the native library.
  */
 public abstract class PathUtils {
 
     private static String sDataDirectorySuffix;
-    private static String sWebappDirectorySuffix;
-    private static String sWebappCacheDirectory;
 
     // Prevent instantiation.
     private PathUtils() {}
@@ -32,17 +28,6 @@ public static void setPrivateDataDirectorySuffix(String suffix) {
         sDataDirectorySuffix = suffix;
     }
 
-    /**
-     * Sets the directory info used for chrome process running in application mode.
-     *
-     * @param webappSuffix The suffix of the directory used for storing webapp-specific profile
-     * @param cacheDir Cache directory name for web apps.
-     */
-    public static void setWebappDirectoryInfo(String webappSuffix, String cacheDir) {
-        sWebappDirectorySuffix = webappSuffix;
-        sWebappCacheDirectory = cacheDir;
-    }
-
     /**
      * @return the private directory that is used to store application data.
      */
@@ -70,15 +55,7 @@ public static String getDatabaseDirectory(Context appContext) {
     @SuppressWarnings("unused")
     @CalledByNative
     public static String getCacheDirectory(Context appContext) {
-        if (ContextTypes.getInstance().getType(appContext) == ContextTypes.CONTEXT_TYPE_NORMAL) {
-            return appContext.getCacheDir().getPath();
-        }
-        if (sWebappDirectorySuffix == null || sWebappCacheDirectory == null) {
-            throw new IllegalStateException(
-                    "setWebappDirectoryInfo must be called before getCacheDirectory");
-        }
-        return new File(appContext.getDir(sWebappDirectorySuffix, appContext.MODE_PRIVATE),
-                sWebappCacheDirectory).getPath();
+        return appContext.getCacheDir().getPath();
     }
 
     /**

diff --git a/base/android/javatests/src/org/chromium/base/ContextTypesTest.java b/base/android/javatests/src/org/chromium/base/ContextTypesTest.java
diff --git a/base/base.gyp b/base/base.gyp
@@ -1262,13 +1262,6 @@
             'android/java/src/org/chromium/base/ThreadUtils.java',
             'android/java/src/org/chromium/base/TraceEvent.java',
           ],
-          'conditions': [
-            ['google_tv==1', {
-             'sources': [
-               'android/java/src/org/chromium/base/ContextTypes.java',
-             ],
-            }],
-          ],
           'variables': {
             'jni_gen_package': 'base',
             'jni_generator_ptr_type': 'long',

diff --git a/base/base.gypi b/base/base.gypi
@@ -713,12 +713,6 @@
               'x11/edid_parser_x11.h',
             ],
           }],
-          ['google_tv==1', {
-           'sources': [
-             'android/context_types.cc',
-             'android/context_types.h',
-           ],
-          }],
         ],
         'defines': [
           'BASE_IMPLEMENTATION',

diff --git a/build/common.gypi b/build/common.gypi
@@ -148,9 +148,6 @@
         # build system.
         'android_webview_build%': 0,
 
-        # Sets whether chrome is built for google tv device.
-        'google_tv%': 0,
-
         # Set ARM architecture version.
         'arm_version%': 7,
 
@@ -254,7 +251,6 @@
       'enable_hidpi%': '<(enable_hidpi)',
       'enable_touch_ui%': '<(enable_touch_ui)',
       'android_webview_build%': '<(android_webview_build)',
-      'google_tv%': '<(google_tv)',
       'use_goma%': '<(use_goma)',
       'gomadir%': '<(gomadir)',
       'enable_app_list%': '<(enable_app_list)',
@@ -698,7 +694,7 @@
           'enable_plugin_installation%': 1,
         }],
 
-        ['(OS=="android" and google_tv!=1) or OS=="ios" or embedded==1', {
+        ['OS=="android" or OS=="ios" or embedded==1', {
           'enable_plugins%': 0,
         }, {
           'enable_plugins%': 1,
@@ -973,7 +969,6 @@
     'android_webview_build%': '<(android_webview_build)',
     'gyp_managed_install%': 0,
     'create_standalone_apk%': 1,
-    'google_tv%': '<(google_tv)',
     'enable_app_list%': '<(enable_app_list)',
     'use_default_render_theme%': '<(use_default_render_theme)',
     'enable_settings_app%': '<(enable_settings_app)',
@@ -1621,7 +1616,7 @@
         'use_cups%': 0,
       }],
 
-      ['enable_plugins==1 and (OS=="linux" or OS=="mac" or OS=="win" or google_tv==1)', {
+      ['enable_plugins==1 and (OS=="linux" or OS=="mac" or OS=="win")', {
         'enable_pepper_cdms%': 1,
       }, {
         'enable_pepper_cdms%': 0,
@@ -1719,11 +1714,6 @@
       ['OS=="android"', {
         'grit_defines': ['-t', 'android',
                          '-E', 'ANDROID_JAVA_TAGGED_ONLY=true'],
-        'conditions': [
-          ['google_tv==1', {
-            'grit_defines': ['-D', 'google_tv'],
-          }],
-        ],
       }],
       ['OS=="mac" or OS=="ios"', {
         'grit_defines': ['-D', 'scale_factors=2x'],
@@ -2179,12 +2169,6 @@
       ['chromeos==1', {
         'defines': ['OS_CHROMEOS=1'],
       }],
-      ['google_tv==1', {
-        'defines': [
-          'GOOGLE_TV=1',
-          'VIDEO_HOLE=1',
-        ],
-      }],
       ['use_xi2_mt!=0 and use_x11==1', {
         'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
       }],

diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/android/chrome_startup_flags.cc
@@ -45,7 +45,4 @@ void SetChromeSpecificCommandLineFlags() {
       switches::kPrerenderFromOmniboxSwitchValueEnabled);
   if (base::android::SysUtils::IsLowEndDevice())
     SetCommandLineSwitch(switches::kDisableSyncFavicons);
-#if defined(GOOGLE_TV)
-  SetCommandLineSwitch(switches::kPpapiInProcess);
-#endif
 }
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
@@ -195,7 +195,7 @@
       <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
       <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type="BINDATA" />
       <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="BINDATA" />
-      <if expr="not is_android or pp_ifdef('google_tv')">
+      <if expr="not is_android">
         <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
         <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" />
       </if>
@@ -204,9 +204,6 @@
       <if expr="pp_ifdef('enable_plugins')">
         <include name="IDR_PDF_MANIFEST" file="resources\pdf\manifest.json" type="BINDATA" />
       </if>
-      <if expr="is_android and pp_ifdef('google_tv')">
-        <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_tv.json" type="BINDATA" />
-      </if>
       <if expr="is_win">
         <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_win.json" type="BINDATA" />
       </if>