[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/20.0.1132.43_r143823-1-7-gfaed2b9

[Shawn Landden]

The following commit has been merged in the master branch:
commit e3e9a801d62957c8321da45828a6b125c8fbb4a0
Author: Shawn Landden <shawnlandden at gmail.com>
Date:   Wed Aug 1 22:49:40 2012 -0700

    replace incorrect prefs.patch with one from OpenSUSE
    
    policy != preferences in Chromium lingo
    
    http://www.chromium.org/administrators/configuring-other-preferences

diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 9433865..34e840e 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -1,14 +1,17 @@
-Tell Chromium to look in /etc/chromium for the master_preferences file
-Index: exp/src/chrome/common/chrome_paths.cc
+Author:  Raymond Wooninck (tittiatcoke)
+Source: OpenSUSE (chromium-master-prefs-path.patch)
+Index: chromium/src/chrome/browser/first_run/first_run_linux.cc
 ===================================================================
---- exp.orig/src/chrome/common/chrome_paths.cc	2012-05-19 16:55:34.000000000 +0200
-+++ exp/src/chrome/common/chrome_paths.cc	2012-05-19 19:22:53.874671178 +0200
-@@ -346,7 +346,7 @@
- #if defined(GOOGLE_CHROME_BUILD)
-       cur = FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
- #else
--      cur = FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
-+      cur = FilePath(FILE_PATH_LITERAL("/etc/chromium-browser/master_preferences"));
- #endif
-       break;
-     }
+--- chromium.orig/src/chrome/browser/first_run/first_run_linux.cc
++++ chromium/src/chrome/browser/first_run/first_run_linux.cc
+@@ -100,8 +100,7 @@ void AutoImport(
+ FilePath MasterPrefsPath() {
+   // The standard location of the master prefs is next to the chrome binary.
+   FilePath master_prefs;
+-  if (!PathService::Get(base::DIR_EXE, &master_prefs))
+-    return FilePath();
++  master_prefs = FilePath("/etc/chromium");
+   return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
+ }
+ 
+

-- 
Git repository for pkg-chromium