diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 18:34:04 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 18:34:04 +0000 |
| commit | 09f9700748d2ba496016bd91e595baaae506067c (patch) | |
| tree | 353aa3f2e9f5d6b049709d0207732ccc26247084 /remoting/host | |
| parent | 658f03f18b7bb5f475e8536d4689e153549e5ac9 (diff) | |
| download | chromium_src-09f9700748d2ba496016bd91e595baaae506067c.zip chromium_src-09f9700748d2ba496016bd91e595baaae506067c.tar.gz chromium_src-09f9700748d2ba496016bd91e595baaae506067c.tar.bz2 | |
remoting: Change daemon_controller_mac from .cc to .mm.
This allows using the system header definition of NSLibraryDirectory, which
is the easiest fix to get this file building with the 10.8 SDK.
No intended functionality change.
Also remove a comment from the gyp file wondering if something in the gyp
file is correct. It is correct as is.
BUG=139138
R=jamiewalch@chromium.org
Review URL: https://codereview.chromium.org/17129002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/setup/daemon_controller_mac.mm (renamed from remoting/host/setup/daemon_controller_mac.cc) | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/remoting/host/setup/daemon_controller_mac.cc b/remoting/host/setup/daemon_controller_mac.mm index e36a69b..91773be 100644 --- a/remoting/host/setup/daemon_controller_mac.cc +++ b/remoting/host/setup/daemon_controller_mac.mm @@ -31,12 +31,6 @@ namespace remoting { namespace { -// The NSSystemDirectories.h header has a conflicting definition of -// NSSearchPathDirectory with the one in base/mac/foundation_util.h. -// Foundation.h would work, but it can only be included from Objective-C files. -// Therefore, we define the needed constants here. -const int NSLibraryDirectory = 5; - class DaemonControllerMac : public remoting::DaemonController { public: DaemonControllerMac(); |