← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/configuration-directory.patch

  • Committer: Olivier Tilloy
  • Date: 2017-12-15 09:10:55 UTC
  • mfrom: (1358.1.57 artful-dev)
  • Revision ID: olivier.tilloy@canonical.com-20171215091055-294mdt7uh3wpkzjb
* Upstream beta channel update: 64.0.3282.24
* debian/control: update Vcs-Bzr field
* debian/rules: remove enable_hotwording build flag
* debian/patches/add-missing-cstddef-include.patch: added
* debian/patches/configuration-directory.patch: refreshed
* debian/patches/disable-sse2: refreshed
* debian/patches/enable-chromecast-by-default.patch: refreshed
* debian/patches/fix-ffmpeg-ia32-build.patch: added
* debian/patches/last-commit-position: refreshed
* debian/patches/no-xlocale-header.patch: removed, no longer needed
* debian/patches/revert-clang-nostdlib++.patch: updated
* debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch: refreshed
* debian/patches/search-credit.patch: refreshed
* debian/patches/set-rpath-on-chromium-executables.patch: refreshed
* debian/patches/suppress-newer-clang-warning-flags.patch: updated
* debian/patches/title-bar-default-system.patch-v35: refreshed
* debian/patches/touch-v35: refreshed
* debian/patches/widevine-other-locations: refreshed
* debian/known_gn_gen_args-*: remove enable_hotwording build flag

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/configuration-directory.patch
13
13
 
14
14
 // The path to the hint file that tells the pepper plugin loader
15
15
 // where it can find the latest component updated flash.
16
 
@@ -480,6 +482,9 @@ bool PathProvider(int key, base::FilePat
 
16
@@ -473,6 +475,9 @@ bool PathProvider(int key, base::FilePat
17
17
       cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
18
18
 #else
19
19
       cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
23
23
 #endif
24
24
       break;
25
25
     }
26
 
@@ -495,6 +500,10 @@ bool PathProvider(int key, base::FilePat
 
26
@@ -488,6 +493,10 @@ bool PathProvider(int key, base::FilePat
27
27
 #endif
28
28
 #if defined(OS_LINUX)
29
29
     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
34
34
       cur = base::FilePath(kFilepathSinglePrefExtensions);
35
35
       break;
36
36
     }
37
 
@@ -545,6 +554,10 @@ bool PathProvider(int key, base::FilePat
 
37
@@ -538,6 +547,10 @@ bool PathProvider(int key, base::FilePat
38
38
 #else
39
39
       cur = base::FilePath(FILE_PATH_LITERAL(
40
40
           "/etc/chromium/native-messaging-hosts"));