Merge branch 'dev-40'

[packages/chromium-browser.git] / master-prefs-path.patch

diff --git a/master-prefs-path.patch b/master-prefs-path.patch
index b037842869b5f9d0f7a1cef33da2c4bd7f5c9d2b..40b66182c3561e078b429c8c9fb391c97fe629ae 100644 (file)
--- a/master-prefs-path.patch
+++ b/master-prefs-path.patch
@@ -1,12 +1,12 @@
---- chromium-browser-26.0.1410.12/src/chrome/browser/first_run/first_run_linux.cc~     2013-02-21 12:11:48.000000000 +0200
-+++ chromium-browser-26.0.1410.12/src/chrome/browser/first_run/first_run_linux.cc      2013-02-25 16:00:59.000031225 +0200
+--- chromium-browser-26.0.1410.12/src/chrome/browser/first_run/first_run_internal_linux.cc~    2013-02-21 12:11:48.000000000 +0200
++++ chromium-browser-26.0.1410.12/src/chrome/browser/first_run/first_run_internal_linux.cc     2013-02-25 16:00:59.000031225 +0200
 @@ -71,8 +71,7 @@
  base::FilePath MasterPrefsPath() {
    // The standard location of the master prefs is next to the chrome binary.
    base::FilePath master_prefs;
 -  if (!PathService::Get(base::DIR_EXE, &master_prefs))
 -    return base::FilePath();
-+  master_prefs = FilePath("/etc/chromium-browser");
++  master_prefs = base::FilePath("/etc/chromium-browser");
    return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
  }