← Back to branch summary

~saiarcot895/chromium-browser/chromium-browser.utopic.beta

« back to all changes in this revision

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

  • Committer: Saikrishna Arcot
  • Date: 2015-08-14 15:34:36 UTC
  • Revision ID: saikrishna@saikrishna-vps-20150814153436-vceutnhonaj9cgik
Tags: 45.0.2454.37-0ubuntu1~ppa1~utopic1
* New upstream version 45.0.2454.37
* Refreshed and updated patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/configuration-directory.patch
6
6
===================================================================
7
7
--- beta.wily.orig/chrome/common/chrome_paths.cc
8
8
+++ beta.wily/chrome/common/chrome_paths.cc
9
 
@@ -72,6 +72,8 @@ const base::FilePath::CharType kFilepath
 
9
@@ -60,6 +60,8 @@ const base::FilePath::CharType kFilepath
10
10
 #else
11
11
     FILE_PATH_LITERAL("/usr/share/chromium/extensions");
12
12
 #endif  // defined(GOOGLE_CHROME_BUILD)
15
15
 #endif  // defined(OS_LINUX)
16
16
 
17
17
 static base::LazyInstance<base::FilePath>
18
 
@@ -455,6 +457,9 @@ bool PathProvider(int key, base::FilePat
 
18
@@ -461,6 +463,9 @@ bool PathProvider(int key, base::FilePat
19
19
       cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
20
20
 #else
21
21
       cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
25
25
 #endif
26
26
       break;
27
27
     }
28
 
@@ -485,6 +490,10 @@ bool PathProvider(int key, base::FilePat
 
28
@@ -491,6 +496,10 @@ bool PathProvider(int key, base::FilePat
29
29
 #endif
30
30
 #if defined(OS_LINUX)
31
31
     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
36
36
       cur = base::FilePath(kFilepathSinglePrefExtensions);
37
37
       break;
38
38
     }
39
 
@@ -535,6 +544,10 @@ bool PathProvider(int key, base::FilePat
 
39
@@ -541,6 +550,10 @@ bool PathProvider(int key, base::FilePat
40
40
 #else
41
41
       cur = base::FilePath(FILE_PATH_LITERAL(
42
42
           "/etc/chromium/native-messaging-hosts"));