Upstreaming chrome/common/chrome_* diff.

chrome/common/chrome_constants.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/common/chrome_constants.h"
 
 #include "base/file_path.h"
 
 #define FPL FILE_PATH_LITERAL
 
@@ skipping 47 matching lines @@
     FPL("chrome.exe");
 const FilePath::CharType kHelperProcessExecutableName[] = FPL("chrome.exe");
 #elif defined(OS_MACOSX)
 const FilePath::CharType kBrowserProcessExecutableNameChromium[] =
     FPL(CHROMIUM_PRODUCT_STRING);
 const FilePath::CharType kBrowserProcessExecutableName[] = FPL(PRODUCT_STRING);
 const FilePath::CharType kHelperProcessExecutableNameChromium[] =
     FPL(CHROMIUM_PRODUCT_STRING " Helper");
 const FilePath::CharType kHelperProcessExecutableName[] =
     FPL(PRODUCT_STRING " Helper");
+#elif defined(OS_ANDROID)
+// NOTE: Keep it synced with the process names defined in AndroidManifest.xml.
+const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome");
+const FilePath::CharType kBrowserProcessExecutableNameChromium[] =
+    FPL("");
+const FilePath::CharType kHelperProcessExecutableName[] =
+    FPL("sandboxed_process");
+const FilePath::CharType kHelperProcessExecutableNameChromium[] = FPL("");
 #elif defined(OS_POSIX)
 const FilePath::CharType kBrowserProcessExecutableNameChromium[] =
     FPL("chrome");
 const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome");
 // Helper processes end up with a name of "exe" due to execing via
 // /proc/self/exe.  See bug 22703.
 const FilePath::CharType kHelperProcessExecutableNameChromium[] = FPL("exe");
 const FilePath::CharType kHelperProcessExecutableName[] = FPL("exe");
 #endif  // OS_*
 
 #if defined(OS_WIN)
 const FilePath::CharType kBrowserProcessExecutablePathChromium[] =
     FPL("chrome.exe");
 const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome.exe");
 const FilePath::CharType kHelperProcessExecutablePathChromium[] =
     FPL("chrome.exe");
 const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome.exe");
 #elif defined(OS_MACOSX)
 const FilePath::CharType kBrowserProcessExecutablePathChromium[] =
     FPL(CHROMIUM_PRODUCT_STRING ".app/Contents/MacOS/" CHROMIUM_PRODUCT_STRING);
 const FilePath::CharType kBrowserProcessExecutablePath[] =
     FPL(PRODUCT_STRING ".app/Contents/MacOS/" PRODUCT_STRING);
 const FilePath::CharType kHelperProcessExecutablePathChromium[] =
     FPL(CHROMIUM_PRODUCT_STRING " Helper.app/Contents/MacOS/"
         CHROMIUM_PRODUCT_STRING " Helper");
 const FilePath::CharType kHelperProcessExecutablePath[] =
     FPL(PRODUCT_STRING " Helper.app/Contents/MacOS/" PRODUCT_STRING " Helper");
+#elif defined(OS_ANDROID)
+const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome");
+const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome");
+const FilePath::CharType kBrowserProcessExecutablePathChromium[] =
+    FPL("chrome");
+const FilePath::CharType kHelperProcessExecutablePathChromium[] = FPL("chrome");
 #elif defined(OS_POSIX)
 const FilePath::CharType kBrowserProcessExecutablePathChromium[] =
     FPL("chrome");
 const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome");
 const FilePath::CharType kHelperProcessExecutablePathChromium[] = FPL("chrome");
 const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome");
 #endif  // OS_*
 
 #if defined(OS_MACOSX)
 const FilePath::CharType kFrameworkName[] =
@@ skipping 91 matching lines @@
 #else
 // const bool kRecordModeEnabled = false;
 #endif
 
 const bool kRecordModeEnabled = true;
 
 const char* const kUnknownLanguageCode = "und";
 
 const int kJavascriptMessageExpectedDelay = 1000;
 
+#if defined(OS_ANDROID)
+const bool kEnableTouchIcon = true;
+#else
 const bool kEnableTouchIcon = false;
+#endif
 
 const float kMaxShareOfExtensionProcesses = 0.30f;
 
 #if defined(OS_LINUX)
 extern const int kLowestRendererOomScore = 300;
 extern const int kHighestRendererOomScore = 1000;
 #endif
 
 #if defined(OS_WIN)
 // This is used by the PreRead experiment.
 const char kPreReadEnvironmentVariable[] = "CHROME_PRE_READ_EXPERIMENT";
 // This is used by chrome in Windows 8 metro mode.
 const wchar_t kMetroChromeUserDataSubDir[] = L"Metro";
 const wchar_t kMetroNavigationAndSearchMessage[] =
     L"CHROME_METRO_NAV_SEARCH_REQUEST";
 const wchar_t kMetroGetCurrentTabInfoMessage[] =
     L"CHROME_METRO_GET_CURRENT_TAB_INFO";
 const wchar_t kMetroRegistryPath[] =
     L"Software\\" PRODUCT_STRING_PATH L"\\Metro";
 const wchar_t kLaunchModeValue[] = L"launch_mode";
 #endif
 
 }  // namespace chrome
 
 #undef FPL