Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

6 files changed, 122 insertions, 57 deletions

diff --git a/chromium/cloud_print/cloud_print.gyp b/chromium/cloud_print/cloud_print.gyp
index cf3c5433be3..7d1b3ced7d2 100644
--- a/chromium/cloud_print/cloud_print.gyp
+++ b/chromium/cloud_print/cloud_print.gyp
@@ -4,56 +4,9 @@
 {
   'variables': {
     'chromium_code': 1,
-
-    'variables': {
-      'version_py_path': '../tools/build/version.py',
-      'version_path': 'VERSION',
-    },
-    'version_py_path': '<(version_py_path) -f',
-    'version_path': '<(version_path)',
   },
-  'includes': [
-    '../chrome/version.gypi',
-  ],
   'targets': [
     {
-      'target_name': 'cloud_print_version_resources',
-      'type': 'none',
-      'conditions': [
-        ['branding == "Chrome"', {
-          'variables': {
-             'branding_path': '<(DEPTH)/chrome/app/theme/google_chrome/BRANDING',
-          },
-        }, { # else branding!="Chrome"
-          'variables': {
-             'branding_path': '<(DEPTH)/chrome/app/theme/chromium/BRANDING',
-          },
-        }],
-      ],
-      'variables': {
-        'output_dir': 'cloud_print',
-        'template_input_path': '../chrome/app/chrome_version.rc.version', 
-        'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
-        'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
-      },
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)',
-        ],
-      },
-      'sources': [
-        'service/win/cloud_print_service_exe.ver',
-        'service/win/cloud_print_service_config_exe.ver',
-        'service/win/cloud_print_service_setup_exe.ver',
-        'virtual_driver/win/gcp_portmon64_dll.ver',
-        'virtual_driver/win/gcp_portmon_dll.ver',
-        'virtual_driver/win/install/virtual_driver_setup_exe.ver',
-      ],
-      'includes': [
-        '../chrome/version_resource_rules.gypi',
-      ],
-    },
-    {
       'target_name': 'cloud_print',
       'type': 'none',
       'dependencies': [
diff --git a/chromium/cloud_print/cloud_print_resources.gyp b/chromium/cloud_print/cloud_print_resources.gyp
new file mode 100644
index 00000000000..1eaaaec49a1
--- /dev/null
+++ b/chromium/cloud_print/cloud_print_resources.gyp
@@ -0,0 +1,109 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'variables': {
+    'chromium_code': 1,
+
+    'variables': {
+      'version_py_path': '../tools/build/version.py',
+      'version_path': 'VERSION',
+    },
+    'version_py_path': '<(version_py_path) -f',
+    'version_path': '<(version_path)',
+  },
+  'includes': [
+    '../chrome/version.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'cloud_print_version_resources',
+      'type': 'none',
+      'conditions': [
+        ['branding == "Chrome"', {
+          'variables': {
+             'branding_path': '<(DEPTH)/chrome/app/theme/google_chrome/BRANDING',
+          },
+        }, { # else branding!="Chrome"
+          'variables': {
+             'branding_path': '<(DEPTH)/chrome/app/theme/chromium/BRANDING',
+          },
+        }],
+      ],
+      'variables': {
+        'output_dir': 'cloud_print',
+        'template_input_path': '../chrome/app/chrome_version.rc.version', 
+        'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
+        'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
+      },
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)',
+        ],
+      },
+      'sources': [
+        'service/win/cloud_print_service_exe.ver',
+        'service/win/cloud_print_service_config_exe.ver',
+        'service/win/cloud_print_service_setup_exe.ver',
+        'virtual_driver/win/gcp_portmon64_dll.ver',
+        'virtual_driver/win/gcp_portmon_dll.ver',
+        'virtual_driver/win/install/virtual_driver_setup_exe.ver',
+      ],
+      'includes': [
+        '../chrome/version_resource_rules.gypi',
+      ],
+    },
+    {
+      'target_name': 'cloud_print_version_header',
+      'type': 'none',
+      'conditions': [
+        ['branding == "Chrome"', {
+          'variables': {
+             'branding_path': '<(DEPTH)/chrome/app/theme/google_chrome/BRANDING',
+          },
+        }, { # else branding!="Chrome"
+          'variables': {
+             'branding_path': '<(DEPTH)/chrome/app/theme/chromium/BRANDING',
+          },
+        }],
+      ],
+      'hard_dependency': 1,
+      'actions': [
+        {
+          'action_name': 'version_header',
+          'variables': {
+            'output_dir': 'cloud_print',
+            'lastchange_path':
+              '<(DEPTH)/build/util/LASTCHANGE',
+          },
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)',
+            ],
+          },
+          'inputs': [
+            '<(version_path)',
+            '<(branding_path)',
+            '<(lastchange_path)',
+            '<(DEPTH)/chrome/version.h.in',
+            'BRANDING',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)/version.h',
+          ],
+          'action': [
+            'python',
+            '<(version_py_path)',
+            '-f', '<(version_path)',
+            '-f', '<(branding_path)',
+            '-f', '<(lastchange_path)',
+            '-f', 'BRANDING',
+            '<(DEPTH)/chrome/version.h.in',
+            '<@(_outputs)',
+          ],
+          'message': 'Generating version header file: <@(_outputs)',
+        },
+      ],
+    },
+  ],
+}
diff --git a/chromium/cloud_print/gcp20/prototype/gcp20_device.gyp b/chromium/cloud_print/gcp20/prototype/gcp20_device.gyp
index 0952344cd26..c47012ae567 100644
--- a/chromium/cloud_print/gcp20/prototype/gcp20_device.gyp
+++ b/chromium/cloud_print/gcp20/prototype/gcp20_device.gyp
@@ -21,6 +21,7 @@
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_header', 
         '<(DEPTH)/google_apis/google_apis.gyp:google_apis',
         '<(DEPTH)/jingle/jingle.gyp:notifier',
         '<(DEPTH)/net/net.gyp:http_server',
diff --git a/chromium/cloud_print/service/service.gyp b/chromium/cloud_print/service/service.gyp
index 1bdc5528b1e..f4bc65bb670 100644
--- a/chromium/cloud_print/service/service.gyp
+++ b/chromium/cloud_print/service/service.gyp
@@ -57,7 +57,6 @@
         '<(DEPTH)/google_apis/google_apis.gyp:google_apis',
         '<(DEPTH)/ipc/ipc.gyp:ipc',
         '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/printing/printing.gyp:printing',
         '<(DEPTH)/url/url.gyp:url_lib',
         'service_resources',
       ],
@@ -69,6 +68,11 @@
             '<(DEPTH)/chrome/common_constants.gyp:common_constants',
           ],
         }],
+        ['enable_printing!=0', {
+          'dependencies': [
+            '<(DEPTH)/printing/printing.gyp:printing',
+          ],
+        }],
       ],
       'sources': [
         '<(DEPTH)/content/public/common/content_switches.h',
@@ -133,19 +137,17 @@
         'cloud_print_service_lib',
       ],
       'msvs_settings': {
+        'VCManifestTool': {
+          'AdditionalManifestFiles': [
+            'common-controls.manifest',
+          ],
+        },
         'VCLinkerTool': {
           'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
           'UACExecutionLevel': '2', # /level='requireAdministrator'
           'AdditionalDependencies': [
               'secur32.lib',
           ],
-          'AdditionalOptions': [  # Enable Vista+ look.
-            "\"/manifestdependency:type='win32' "
-                "name='Microsoft.Windows.Common-Controls' "
-                "version='6.0.0.0' "
-                "processorArchitecture='*' "
-                "publicKeyToken='6595b64144ccf1df' language='*'\"",
-          ],
         },
       },
     },
diff --git a/chromium/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp b/chromium/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
index 6180806666a..70d14b6044a 100644
--- a/chromium/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
+++ b/chromium/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
@@ -23,7 +23,7 @@
         '../virtual_driver.gyp:virtual_driver_lib',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/cloud_print/common/common.gyp:cloud_print_install_lib',
-        '<(DEPTH)/cloud_print/cloud_print.gyp:cloud_print_version_resources',
+        '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_resources',
         'virtual_driver_setup_resources',
       ],
       'sources': [
diff --git a/chromium/cloud_print/virtual_driver/win/virtual_driver.gypi b/chromium/cloud_print/virtual_driver/win/virtual_driver.gypi
index 80c0ffb1851..41b2a97fe0f 100644
--- a/chromium/cloud_print/virtual_driver/win/virtual_driver.gypi
+++ b/chromium/cloud_print/virtual_driver/win/virtual_driver.gypi
@@ -49,7 +49,7 @@
       'dependencies': [
         'gcp_portmon_lib<(virtual_driver_suffix)',
         '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
-        '<(DEPTH)/cloud_print/cloud_print.gyp:cloud_print_version_resources',
+        '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_resources',
       ],
       'include_dirs': [
         # To allow including "version.h"