| OLD | NEW | 
|---|
| 1 #!/bin/sh | 1 #!/bin/sh | 
| 2 | 2 | 
| 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be | 
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. | 
| 6 | 6 | 
| 7 # Set up to start the X server ASAP, then let the startup run in the | 7 # Set up to start the X server ASAP, then let the startup run in the | 
| 8 # background while we set up other stuff. | 8 # background while we set up other stuff. | 
| 9 XAUTH_FILE="/var/run/chromelogin.auth" | 9 XAUTH_FILE="/var/run/chromelogin.auth" | 
| 10 MCOOKIE=$(head -c 8 /dev/urandom | openssl md5)  # speed this up? | 10 MCOOKIE=$(head -c 8 /dev/urandom | openssl md5)  # speed this up? | 
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 224     PLUGIN_STRING="${PLUGIN_STRING}#${PLUGIN_NAME}" | 224     PLUGIN_STRING="${PLUGIN_STRING}#${PLUGIN_NAME}" | 
| 225     if [ -n "$DESCRIPTION" ]; then | 225     if [ -n "$DESCRIPTION" ]; then | 
| 226       PLUGIN_STRING="${PLUGIN_STRING}#${DESCRIPTION}" | 226       PLUGIN_STRING="${PLUGIN_STRING}#${DESCRIPTION}" | 
| 227       [ -n "$VERSION" ] && PLUGIN_STRING="${PLUGIN_STRING}#${VERSION}" | 227       [ -n "$VERSION" ] && PLUGIN_STRING="${PLUGIN_STRING}#${VERSION}" | 
| 228     fi | 228     fi | 
| 229   fi | 229   fi | 
| 230   if [ "$PLUGIN_NAME" = "Shockwave Flash" ]; then | 230   if [ "$PLUGIN_NAME" = "Shockwave Flash" ]; then | 
| 231     # Flash is treated specially. | 231     # Flash is treated specially. | 
| 232     FLASH_FLAGS="--ppapi-flash-path=${FILE_NAME}" | 232     FLASH_FLAGS="--ppapi-flash-path=${FILE_NAME}" | 
| 233     FLASH_FLAGS="${FLASH_FLAGS} --ppapi-flash-version=${VERSION}" | 233     FLASH_FLAGS="${FLASH_FLAGS} --ppapi-flash-version=${VERSION}" | 
|  | 234     FLASH_FLAGS="${FLASH_FLAGS} --ppapi-flash-in-process" | 
| 234   else | 235   else | 
| 235     PLUGIN_STRING="${PLUGIN_STRING};${MIME_TYPES}" | 236     PLUGIN_STRING="${PLUGIN_STRING};${MIME_TYPES}" | 
| 236     REGISTER_PLUGINS="${REGISTER_PLUGINS}${COMMA}${PLUGIN_STRING}" | 237     REGISTER_PLUGINS="${REGISTER_PLUGINS}${COMMA}${PLUGIN_STRING}" | 
| 237     COMMA="," | 238     COMMA="," | 
| 238   fi | 239   fi | 
| 239 done | 240 done | 
| 240 if [ -n "$REGISTER_PLUGINS" ]; then | 241 if [ -n "$REGISTER_PLUGINS" ]; then | 
| 241   REGISTER_PLUGINS="--register-pepper-plugins=$REGISTER_PLUGINS" | 242   REGISTER_PLUGINS="--register-pepper-plugins=$REGISTER_PLUGINS" | 
| 242 fi | 243 fi | 
| 243 | 244 | 
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 328             --scroll-pixels=4 \ | 329             --scroll-pixels=4 \ | 
| 329             --reload-killed-tabs \ | 330             --reload-killed-tabs \ | 
| 330             --user-data-dir="$DATA_DIR" \ | 331             --user-data-dir="$DATA_DIR" \ | 
| 331             "$REGISTER_PLUGINS" \ | 332             "$REGISTER_PLUGINS" \ | 
| 332             "$TOUCH_DEVICES" \ | 333             "$TOUCH_DEVICES" \ | 
| 333             ${ACCELERATED_FLAGS} \ | 334             ${ACCELERATED_FLAGS} \ | 
| 334             ${FLASH_FLAGS} \ | 335             ${FLASH_FLAGS} \ | 
| 335             ${SCREENSAVER_FLAG} \ | 336             ${SCREENSAVER_FLAG} \ | 
| 336             ${SKIP_OOBE} \ | 337             ${SKIP_OOBE} \ | 
| 337 -- "$WM_SCRIPT" | 338 -- "$WM_SCRIPT" | 
| OLD | NEW | 
|---|