Chromium Code Reviews| Index: remoting/host/constants_mac.cc |
| diff --git a/remoting/host/constants_mac.cc b/remoting/host/constants_mac.cc |
| index 7491414ebec786fef7aa92b625ab76faa4c0054e..2d987232b9ecde06beff3ddcec900f483b7e5a1e 100644 |
| --- a/remoting/host/constants_mac.cc |
| +++ b/remoting/host/constants_mac.cc |
| @@ -7,6 +7,8 @@ |
| namespace remoting { |
| #define SERVICE_NAME "org.chromium.chromoting" |
| +#define PREFPANE_BUNDLE_NAME "ChromeRemoteDesktop.prefPane" |
|
Sergey Ulanov
2014/03/24 19:11:04
Pass these from gyp, so that they are correct for
weitao
2014/03/24 21:21:33
We need to do this for HOST_BUNDLE_NAME as well as
|
| +#define HOST_BUNDLE_NAME "ChromeRemoteDesktopHost.bundle" |
| #define APPLICATIONS_DIR "/Applications/" |
| #define HELPER_TOOLS_DIR "/Library/PrivilegedHelperTools/" |
| @@ -17,14 +19,14 @@ namespace remoting { |
| const char kServiceName[] = SERVICE_NAME; |
| -const char kPrefPaneFileName[] = SERVICE_NAME ".prefPane"; |
| -const char kPrefPaneFilePath[] = PREFERENCE_PANES_DIR SERVICE_NAME ".prefPane"; |
| +const char kPrefPaneFileName[] = PREFPANE_BUNDLE_NAME; |
| +const char kPrefPaneFilePath[] = PREFERENCE_PANES_DIR PREFPANE_BUNDLE_NAME; |
| const char kHostConfigFileName[] = SERVICE_NAME ".json"; |
| const char kHostConfigFilePath[] = HELPER_TOOLS_DIR SERVICE_NAME ".json"; |
| const char kHostHelperScriptPath[] = HELPER_TOOLS_DIR SERVICE_NAME ".me2me.sh"; |
| -const char kHostBinaryPath[] = HELPER_TOOLS_DIR SERVICE_NAME ".me2me_host.app"; |
| +const char kHostBinaryPath[] = HELPER_TOOLS_DIR HOST_BUNDLE_NAME; |
| const char kHostEnabledPath[] = HELPER_TOOLS_DIR SERVICE_NAME ".me2me_enabled"; |
| const char kServicePlistPath[] = LAUNCH_AGENTS_DIR SERVICE_NAME ".plist"; |