Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1168)

Side by Side Diff: remoting/remoting.gyp

Issue 14234012: Enable RDP integration by default when the curtain mode is enabled by the policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing a typo Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # TODO(dmaclach): can we pick this up some other way? Right now it's 7 # TODO(dmaclach): can we pick this up some other way? Right now it's
8 # duplicated from chrome.gyp 8 # duplicated from chrome.gyp
9 'chromium_code': 1, 9 'chromium_code': 1,
10 10
11 'variables': { 11 'variables': {
12 'conditions': [ 12 'conditions': [
13 # Enable the multi-process host on Windows by default. 13 # Enable the multi-process host on Windows by default.
14 ['OS=="win"', { 14 ['OS=="win"', {
15 'remoting_multi_process%': 1, 15 'remoting_multi_process%': 1,
16 }, { 16 }, {
17 'remoting_multi_process%': 0, 17 'remoting_multi_process%': 0,
18 }], 18 }],
19 ], 19 ],
20 }, 20 },
21 21
22 'remoting_multi_process%': '<(remoting_multi_process)', 22 'remoting_multi_process%': '<(remoting_multi_process)',
23 'remoting_rdp_session%': 0, 23 'remoting_rdp_session%': 1,
24 'remoting_use_apps_v2%': 0, 24 'remoting_use_apps_v2%': 0,
25 25
26 # The |major|, |build| and |patch| versions are inherited from Chrome. 26 # The |major|, |build| and |patch| versions are inherited from Chrome.
27 # Since Chrome's |minor| version is always '0', we replace it with a 27 # Since Chrome's |minor| version is always '0', we replace it with a
28 # Chromoting-specific patch version. 28 # Chromoting-specific patch version.
29 # Note that we check both the |chrome_version_path| file and the 29 # Note that we check both the |chrome_version_path| file and the
30 # |remoting_version_path| so that we can override the Chrome version 30 # |remoting_version_path| so that we can override the Chrome version
31 # numbers if needed. 31 # numbers if needed.
32 'version_py_path': '../chrome/tools/build/version.py', 32 'version_py_path': '../chrome/tools/build/version.py',
33 'remoting_version_path': '../remoting/VERSION', 33 'remoting_version_path': '../remoting/VERSION',
(...skipping 2658 matching lines...) Expand 10 before | Expand all | Expand 10 after
2692 '../base/allocator/allocator.gyp:allocator', 2692 '../base/allocator/allocator.gyp:allocator',
2693 ], 2693 ],
2694 }, 2694 },
2695 ], 2695 ],
2696 ], 2696 ],
2697 }], # end of 'toolkit_uses_gtk == 1' 2697 }], # end of 'toolkit_uses_gtk == 1'
2698 ], # end of 'conditions' 2698 ], # end of 'conditions'
2699 }, # end of target 'remoting_unittests' 2699 }, # end of target 'remoting_unittests'
2700 ], # end of targets 2700 ], # end of targets
2701 } 2701 }
OLDNEW
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698