commit ed791da741064a51080ec775001cf843ba6a3143
author Vivek Sekhar <vsekhar@codeaurora.org> Sun Feb 22 12:39:05 2015 -0800
committer Pankaj Garg <pgarg@codeaurora.org> Tue Mar 10 18:59:53 2015 -0700
tree ec3a08e5daab327bb657f6cb4e1c9a9808defaff
parent 06cd42fa8ed24a0755a49d680e4da74ada2d18d5

M42 snap browser

Change-Id: If52741ad5e34241aa9f928244942a33a91610e58

src/com/android/browser/BrowserConfigBase.java

diff --git a/src/com/android/browser/BrowserConfigBase.java b/src/com/android/browser/BrowserConfigBase.java
index a96e6ad..99b6456 100644
--- a/src/com/android/browser/BrowserConfigBase.java
+++ b/src/com/android/browser/BrowserConfigBase.java
@@ -43,6 +43,12 @@
 abstract class BrowserConfigBase {
 
     private static final String OVERRIDE_USER_AGENT = "user-agent";
+    private static final String OVERRIDE_MEDIA_DOWNLOAD = "media-download";
+    private static final String HTTP_HEADERS = "http-headers";
+    private static final String ENABLE_SWE = "enabled-swe";
+    private static final String ENABLE_TOP_CONTROLS = "enable-top-controls-position-calculation";
+    private static final String TOP_CONTROLS_HIDE_THRESHOLD = "top-controls-hide-threshold";
+    private static final String TOP_CONTROLS_SHOW_THRESHOLD = "top-controls-show-threshold";
     private Context mContext;
 
     public BrowserConfigBase(Context context) {
@@ -67,15 +73,31 @@
         }
     }
 
+    public void overrideMediaDownload() {
+        boolean defaultAllowMediaDownloadsValue = mContext.getResources().getBoolean(
+            R.bool.def_allow_media_downloads);
+        if (defaultAllowMediaDownloadsValue)
+            BrowserCommandLine.appendSwitchWithValue(OVERRIDE_MEDIA_DOWNLOAD, "1");
+    }
+
+    public void setExtraHTTPRequestHeaders() {
+        String headers = mContext.getResources().getString(
+            R.string.def_extra_http_headers);
+        if (!TextUtils.isEmpty(headers))
+            BrowserCommandLine.appendSwitchWithValue(HTTP_HEADERS, headers);
+    }
+
     public void initCommandLineSwitches() {
         //SWE-hide-title-bar - enable following flags
-        BrowserCommandLine.appendSwitch("enable-top-controls-position-calculation");
-        BrowserCommandLine.appendSwitchWithValue("top-controls-height", "52");
-        BrowserCommandLine.appendSwitchWithValue("top-controls-show-threshold", "0.5");
-        BrowserCommandLine.appendSwitchWithValue("top-controls-hide-threshold", "0.5");
+        BrowserCommandLine.appendSwitch(ENABLE_TOP_CONTROLS);
+        BrowserCommandLine.appendSwitchWithValue(TOP_CONTROLS_SHOW_THRESHOLD, "0.5");
+        BrowserCommandLine.appendSwitchWithValue(TOP_CONTROLS_HIDE_THRESHOLD, "0.5");
+        BrowserCommandLine.appendSwitch(ENABLE_SWE);
 
         // Allow to override UserAgent
         overrideUserAgent();
+        overrideMediaDownload();
+        setExtraHTTPRequestHeaders();
     }
 
     private String constructUserAgent(String userAgent) {
@@ -98,7 +120,6 @@
         EXIT_DIALOG, /* Add 'Exit' menu item and show 'Minimize or quit' dialog */
         TITLE_IN_URL_BAR, /* Display page title instead of url in URL bar */
         CUSTOM_DOWNLOAD_PATH, /* Allow users to provide custom download path */
-        ALLOW_MEDIA_DOWNLOADS, /* Add 'Allow media downloads' menu item */
         DISABLE_HISTORY /* Allow disabling saving history for non-incognito tabs */
     }
 
@@ -116,8 +137,6 @@
                 return mContext.getResources().getBoolean(R.bool.feature_title_in_URL_bar);
             case CUSTOM_DOWNLOAD_PATH:
                 return mContext.getResources().getBoolean(R.bool.feature_custom_download_path);
-            case ALLOW_MEDIA_DOWNLOADS:
-                return mContext.getResources().getBoolean(R.bool.feature_allow_media_downloads);
             case DISABLE_HISTORY:
                 return mContext.getResources().getBoolean(R.bool.feature_disable_history);
             default: