diff options
author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 05:03:16 +0000 |
---|---|---|
committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 05:03:16 +0000 |
commit | 3efb1b624c74fbdc04a81c4dd186606a097fbfe5 (patch) | |
tree | a043085ef675dc87e31ccbae5c8361c713703f6f | |
parent | c626c735a5aa0501f2f83f6f1f984465c0202e9c (diff) | |
download | chromium_src-3efb1b624c74fbdc04a81c4dd186606a097fbfe5.zip chromium_src-3efb1b624c74fbdc04a81c4dd186606a097fbfe5.tar.gz chromium_src-3efb1b624c74fbdc04a81c4dd186606a097fbfe5.tar.bz2 |
Move remoting pref-pane files to mac/ folder.
Review URL: https://chromiumcodereview.appspot.com/11184031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162652 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | remoting/host/mac/me2me_preference_pane-Info.plist (renamed from remoting/host/me2me_preference_pane-Info.plist) | 0 | ||||
-rw-r--r-- | remoting/host/mac/me2me_preference_pane.h (renamed from remoting/host/me2me_preference_pane.h) | 0 | ||||
-rw-r--r-- | remoting/host/mac/me2me_preference_pane.mm (renamed from remoting/host/me2me_preference_pane.mm) | 6 | ||||
-rw-r--r-- | remoting/host/mac/me2me_preference_pane.xib (renamed from remoting/host/me2me_preference_pane.xib) | 0 | ||||
-rw-r--r-- | remoting/host/mac/me2me_preference_pane_confirm_pin.h (renamed from remoting/host/me2me_preference_pane_confirm_pin.h) | 0 | ||||
-rw-r--r-- | remoting/host/mac/me2me_preference_pane_confirm_pin.mm (renamed from remoting/host/me2me_preference_pane_confirm_pin.mm) | 2 | ||||
-rw-r--r-- | remoting/host/mac/me2me_preference_pane_confirm_pin.xib (renamed from remoting/host/me2me_preference_pane_confirm_pin.xib) | 0 | ||||
-rw-r--r-- | remoting/host/mac/me2me_preference_pane_disable.h (renamed from remoting/host/me2me_preference_pane_disable.h) | 0 | ||||
-rw-r--r-- | remoting/host/mac/me2me_preference_pane_disable.mm (renamed from remoting/host/me2me_preference_pane_disable.mm) | 2 | ||||
-rw-r--r-- | remoting/host/mac/me2me_preference_pane_disable.xib (renamed from remoting/host/me2me_preference_pane_disable.xib) | 0 | ||||
-rw-r--r-- | remoting/remoting.gyp | 24 |
11 files changed, 17 insertions, 17 deletions
diff --git a/remoting/host/me2me_preference_pane-Info.plist b/remoting/host/mac/me2me_preference_pane-Info.plist index 1fab228..1fab228 100644 --- a/remoting/host/me2me_preference_pane-Info.plist +++ b/remoting/host/mac/me2me_preference_pane-Info.plist diff --git a/remoting/host/me2me_preference_pane.h b/remoting/host/mac/me2me_preference_pane.h index d3cfb06..d3cfb06 100644 --- a/remoting/host/me2me_preference_pane.h +++ b/remoting/host/mac/me2me_preference_pane.h diff --git a/remoting/host/me2me_preference_pane.mm b/remoting/host/mac/me2me_preference_pane.mm index dcb3593..ad4ac3c 100644 --- a/remoting/host/me2me_preference_pane.mm +++ b/remoting/host/mac/me2me_preference_pane.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "remoting/host/me2me_preference_pane.h" +#import "remoting/host/mac/me2me_preference_pane.h" #import <Cocoa/Cocoa.h> #include <CommonCrypto/CommonHMAC.h> @@ -20,8 +20,8 @@ #include "base/memory/scoped_ptr.h" #include "remoting/host/constants_mac.h" #include "remoting/host/host_config.h" -#import "remoting/host/me2me_preference_pane_confirm_pin.h" -#import "remoting/host/me2me_preference_pane_disable.h" +#import "remoting/host/mac/me2me_preference_pane_confirm_pin.h" +#import "remoting/host/mac/me2me_preference_pane_disable.h" #include "third_party/jsoncpp/source/include/json/reader.h" #include "third_party/jsoncpp/source/include/json/writer.h" #include "third_party/modp_b64/modp_b64.h" diff --git a/remoting/host/me2me_preference_pane.xib b/remoting/host/mac/me2me_preference_pane.xib index bf6363c..bf6363c 100644 --- a/remoting/host/me2me_preference_pane.xib +++ b/remoting/host/mac/me2me_preference_pane.xib diff --git a/remoting/host/me2me_preference_pane_confirm_pin.h b/remoting/host/mac/me2me_preference_pane_confirm_pin.h index f16ada3..f16ada3 100644 --- a/remoting/host/me2me_preference_pane_confirm_pin.h +++ b/remoting/host/mac/me2me_preference_pane_confirm_pin.h diff --git a/remoting/host/me2me_preference_pane_confirm_pin.mm b/remoting/host/mac/me2me_preference_pane_confirm_pin.mm index 75afd89..d83468a 100644 --- a/remoting/host/me2me_preference_pane_confirm_pin.mm +++ b/remoting/host/mac/me2me_preference_pane_confirm_pin.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "me2me_preference_pane_confirm_pin.h" +#import "remoting/host/mac/me2me_preference_pane_confirm_pin.h" @implementation Me2MePreferencePaneConfirmPin diff --git a/remoting/host/me2me_preference_pane_confirm_pin.xib b/remoting/host/mac/me2me_preference_pane_confirm_pin.xib index 01814e5..01814e5 100644 --- a/remoting/host/me2me_preference_pane_confirm_pin.xib +++ b/remoting/host/mac/me2me_preference_pane_confirm_pin.xib diff --git a/remoting/host/me2me_preference_pane_disable.h b/remoting/host/mac/me2me_preference_pane_disable.h index 9871e7c..9871e7c 100644 --- a/remoting/host/me2me_preference_pane_disable.h +++ b/remoting/host/mac/me2me_preference_pane_disable.h diff --git a/remoting/host/me2me_preference_pane_disable.mm b/remoting/host/mac/me2me_preference_pane_disable.mm index 97bf355..a2aa8b3 100644 --- a/remoting/host/me2me_preference_pane_disable.mm +++ b/remoting/host/mac/me2me_preference_pane_disable.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "me2me_preference_pane_disable.h" +#import "remoting/host/mac/me2me_preference_pane_disable.h" @implementation Me2MePreferencePaneDisable diff --git a/remoting/host/me2me_preference_pane_disable.xib b/remoting/host/mac/me2me_preference_pane_disable.xib index e8d23cc..e8d23cc 100644 --- a/remoting/host/me2me_preference_pane_disable.xib +++ b/remoting/host/mac/me2me_preference_pane_disable.xib diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index dabd993..7338b55 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -435,12 +435,12 @@ 'host/constants_mac.cc', 'host/constants_mac.h', 'host/host_config.cc', - 'host/me2me_preference_pane.h', - 'host/me2me_preference_pane.mm', - 'host/me2me_preference_pane_confirm_pin.h', - 'host/me2me_preference_pane_confirm_pin.mm', - 'host/me2me_preference_pane_disable.h', - 'host/me2me_preference_pane_disable.mm', + 'host/mac/me2me_preference_pane.h', + 'host/mac/me2me_preference_pane.mm', + 'host/mac/me2me_preference_pane_confirm_pin.h', + 'host/mac/me2me_preference_pane_confirm_pin.mm', + 'host/mac/me2me_preference_pane_disable.h', + 'host/mac/me2me_preference_pane_disable.mm', ], 'link_settings': { 'libraries': [ @@ -463,19 +463,19 @@ 'xcode_settings': { 'ARCHS': ['i386', 'x86_64'], 'GCC_ENABLE_OBJC_GC': 'supported', - 'INFOPLIST_FILE': 'host/me2me_preference_pane-Info.plist', + 'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist', 'INFOPLIST_PREPROCESS': 'YES', 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_NAME="<(bundle_name)" BUNDLE_ID="<(bundle_id)" COPYRIGHT_INFO="<(copyright_info)" PREF_PANE_ICON_LABEL="<(pref_pane_icon_label)"', }, 'mac_bundle_resources': [ - 'host/me2me_preference_pane.xib', - 'host/me2me_preference_pane_confirm_pin.xib', - 'host/me2me_preference_pane_disable.xib', - 'host/me2me_preference_pane-Info.plist', + 'host/mac/me2me_preference_pane.xib', + 'host/mac/me2me_preference_pane_confirm_pin.xib', + 'host/mac/me2me_preference_pane_disable.xib', + 'host/mac/me2me_preference_pane-Info.plist', 'resources/chromoting128.png', ], 'mac_bundle_resources!': [ - 'host/me2me_preference_pane-Info.plist', + 'host/mac/me2me_preference_pane-Info.plist', ], 'conditions': [ ['mac_breakpad==1', { |