Fix compilation with disabled remoting.

Fix compilation with disabled remoting.

There are two issues fixed:
 1. Code didn't compile.
 2. The remoting section in option was shown even without --enable-remoting.

BUG=None
TEST=Try to compile with remoting=0 and verify that Remoting doesn't show up in advanced options

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70976

[awong, 2011-01-11 00:09:39]

LGTM

On Mon, Jan 10, 2011 at 3:54 PM, <sergeyu@chromium.org> wrote:

> Reviewers: awong, Alpha,
>
> Description:
> Fix compilation with disabled remoting.
>
> There are two issues fixed:
>  1. Code didn't compile.
>  2. The remoting section in option was shown even without
> --enable-remoting.
>
> BUG=None
> TEST=Try to compile with remoting=0 and verify that Remoting doesn't show
> up in
> advanced options
>
> Please review this at http://codereview.chromium.org/6174005/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M build/common.gypi
>  M chrome/browser/resources/options/advanced_options.html
>  M chrome/chrome.gyp
>
>
> Index: build/common.gypi
> diff --git a/build/common.gypi b/build/common.gypi
> index
>
ae5f41a7e206bc8bb5d216d3e4cdc6dbc604c45d..6215c51d5145bdd0d36550376550d327d50fcee2
> 100644
> --- a/build/common.gypi
> +++ b/build/common.gypi
> @@ -119,6 +119,9 @@
>       # Set to select the Title Case versions of strings in GRD files.
>       'use_titlecase_in_grd_files%': 0,
>
> +      # Remoting compilation is enabled by default. Set to 0 to disable.
> +      'remoting%': 1,
> +
>       'conditions': [
>         # A flag to enable or disable our compile-time dependency
>         # on gnome-keyring. If that dependency is disabled, no
> gnome-keyring
> @@ -173,6 +176,7 @@
>     'library%': '<(library)',
>     'component%': '<(component)',
>     'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
> +    'remoting%': '<(remoting)',
>
>     # The release channel that this build targets. This is used to restrict
>     # channel-specific build options, like which installer packages to
> create.
> @@ -333,9 +337,6 @@
>     # from the system include dirs.
>     'system_libcros%': 0,
>
> -    # Remoting compilation is enabled by default. Set to 0 to disable.
> -    'remoting%': 1,
> -
>     # NOTE: When these end up in the Mac bundle, we need to replace '-' for
> '_'
>     # so Cocoa is happy (http://crbug.com/20441).
>     'locales': [
> @@ -449,6 +450,9 @@
>       ['touchui==1', {
>         'grit_defines': ['-D', 'touchui'],
>       }],
> +      ['remoting==1', {
> +        'grit_defines': ['-D', 'remoting'],
> +      }],
>       ['use_titlecase_in_grd_files==1', {
>         'grit_defines': ['-D', 'use_titlecase'],
>       }],
> Index: chrome/browser/resources/options/advanced_options.html
> diff --git a/chrome/browser/resources/options/advanced_options.html
> b/chrome/browser/resources/options/advanced_options.html
> index
>
997f4f204dcd1d8e49711a60d572d5a14179b54d..c370bfa0f4ec378155f219a01c4d008c74081269
> 100644
> --- a/chrome/browser/resources/options/advanced_options.html
> +++ b/chrome/browser/resources/options/advanced_options.html
> @@ -200,6 +200,8 @@
>       </div>
>     </div>
>   </section>
> +</if>
> +<if expr="pp_ifdef('remoting') and not pp_ifdef('chromeos')">
>   <section id="remoting-section">
>     <h3 i18n-content="advancedSectionTitleRemoting"></h3>
>     <div>
> Index: chrome/chrome.gyp
> diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
> index
>
5095499416eaadea66a75c03fcf0c0205aff945b..06be2e9ca60a0cedae464d3185eb233f790f6cc8
> 100644
> --- a/chrome/chrome.gyp
> +++ b/chrome/chrome.gyp
> @@ -1170,9 +1170,13 @@
>         }],
>         ['remoting==1', {
>           'dependencies': [
> -            '../remoting/remoting.gyp:chromoting_base',
>             '../remoting/remoting.gyp:chromoting_host',
> -            '../remoting/remoting.gyp:chromoting_jingle_glue',
> +          ],
> +        }],
> +        ['remoting==0', {
> +          'sources!': [
> +            'service/remoting/chromoting_host_manager.cc',
> +            'service/remoting/chromoting_host_manager.h',
>           ],
>         }],
>       ],
>
>
>