diff options
| -rw-r--r-- | chrome/browser/child_process_launcher.cc | 2 | ||||
| -rwxr-xr-x | chrome/chrome_browser.gypi | 3 | ||||
| -rw-r--r-- | chrome/chrome_common.gypi | 7 | ||||
| -rw-r--r-- | chrome/common/sandbox_policy.cc (renamed from chrome/browser/sandbox_policy.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/sandbox_policy.h (renamed from chrome/browser/sandbox_policy.h) | 6 |
5 files changed, 12 insertions, 8 deletions
diff --git a/chrome/browser/child_process_launcher.cc b/chrome/browser/child_process_launcher.cc index 91bc2e6..d290e36 100644 --- a/chrome/browser/child_process_launcher.cc +++ b/chrome/browser/child_process_launcher.cc @@ -15,7 +15,7 @@ #include "chrome/common/result_codes.h" #if defined(OS_WIN) -#include "chrome/browser/sandbox_policy.h" +#include "chrome/common/sandbox_policy.h" #elif defined(OS_LINUX) #include "base/singleton.h" #include "chrome/browser/crash_handler_host_linux.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 804b539..23c2cda 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1450,8 +1450,6 @@ 'browser/safe_browsing/safe_browsing_service.h', 'browser/safe_browsing/safe_browsing_util.cc', 'browser/safe_browsing/safe_browsing_util.h', - 'browser/sandbox_policy.cc', - 'browser/sandbox_policy.h', 'browser/search_versus_navigate_classifier.cc', 'browser/search_versus_navigate_classifier.h', 'browser/search_engines/edit_search_engine_controller.cc', @@ -2513,7 +2511,6 @@ 'browser/ime_input.cc', 'browser/importer/ie_importer.cc', 'browser/jumplist.cc', - 'browser/sandbox_policy.cc', ], }], # views depends on webkit headers. diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 1355cb1..0a09fbe 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -84,6 +84,8 @@ 'common/sandbox_init_wrapper_win.cc', 'common/sandbox_mac.h', 'common/sandbox_mac.mm', + 'common/sandbox_policy.cc', + 'common/sandbox_policy.h', 'common/task_queue.cc', 'common/task_queue.h', 'common/time_format.cc', @@ -310,6 +312,11 @@ 'common/process_watcher_posix.cc', ], }], + ['OS!="win"', { + 'sources!': [ + 'common/sandbox_policy.cc', + ], + }], ], 'export_dependent_settings': [ '../app/app.gyp:app_base', diff --git a/chrome/browser/sandbox_policy.cc b/chrome/common/sandbox_policy.cc index ce137e0..09abe3c 100644 --- a/chrome/browser/sandbox_policy.cc +++ b/chrome/common/sandbox_policy.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/sandbox_policy.h" +#include "chrome/common/sandbox_policy.h" #include "app/win_util.h" #include "base/command_line.h" diff --git a/chrome/browser/sandbox_policy.h b/chrome/common/sandbox_policy.h index bb2e6d7..dcc466d 100644 --- a/chrome/browser/sandbox_policy.h +++ b/chrome/common/sandbox_policy.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SANDBOX_POLICY_H_ -#define CHROME_BROWSER_SANDBOX_POLICY_H_ +#ifndef CHROME_COMMON_SANDBOX_POLICY_H_ +#define CHROME_COMMON_SANDBOX_POLICY_H_ #include "base/process.h" #include "base/file_path.h" @@ -22,4 +22,4 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, } // namespace sandbox -#endif // CHROME_BROWSER_SANDBOX_POLICY_H_ +#endif // CHROME_COMMON_SANDBOX_POLICY_H_ |