Move WindowOpenDisposition.template to ui/base/android.

ui/ui.gyp

 # Copyright (c) 2012 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,
   },
   'includes': [
     'ui_resources.gypi',
@@ skipping 36 matching lines @@
         'base/accelerators/platform_accelerator.h',
         'base/accelerators/platform_accelerator_cocoa.h',
         'base/accelerators/platform_accelerator_cocoa.mm',
         'base/accelerators/platform_accelerator_gtk.cc',
         'base/accelerators/platform_accelerator_gtk.h',
         'base/accessibility/accessibility_types.h',
         'base/accessibility/accessible_text_utils.cc',
         'base/accessibility/accessible_text_utils.h',
         'base/accessibility/accessible_view_state.cc',
         'base/accessibility/accessible_view_state.h',
         'base/android/ui_jni_registrar.cc',

[tfarina, 2013/11/12 01:00:37]

I'm talking about these C++ source files.

If I revert https://codereview.chromium.org/51663003/, then we need to create a
separate target to build them.

That is why I suggested ui_android_java. Perphaps ui_android_cpp makes more
sense?

WYT?

[tfarina, 2013/11/12 19:26:36]

ui/android/cpp/src/ui_jni_registrar.* would be good place for these two files?

Maybe just ui/android/ui_jni_registar.* is OK?

Could be in ui/android/cpp/ui_jni_registrar.* also.

Which one do you prefer? I'm fine to take any suggestion/preference you have.

I like to use 'cpp', because it pairs with 'java'.

I saw the use of 'cpp' in third_party/libaddressinput/

[tfarina, 2013/11/12 19:26:36]

One second though, looks like it is OK to keep ui_jni_registrar.cc here.

See my comments in
https://codereview.chromium.org/51663003/diff/1/ui/android/ui_jni_registrar.cc
and
https://codereview.chromium.org/51663003/diff/1/ui/base/android/ui_jni_regist...

[Ted C, 2013/11/12 19:44:58]

agreed.  I think ui_base_jni_registrar is good.

[Ted C, 2013/11/12 19:44:58]

Not that I think this matters anymore, but if this were to come up again I would
vote against cpp purely based on consistency.  We don't use that in any
non-third_party directories, so we'd want a larger decision before taking this
path just in ui/

         'base/android/ui_jni_registrar.h',
         'base/android/view_android.cc',
         'base/android/view_android.h',
         'base/android/window_android.cc',
         'base/android/window_android.h',
         'base/base_window.cc',
         'base/base_window.h',
         'base/clipboard/clipboard.cc',
         'base/clipboard/clipboard.h',
         'base/clipboard/clipboard_android.cc',
@@ skipping 197 matching lines @@
         'base/touch/touch_enabled.h',
         'base/ui_base_exports.cc',
         'base/ui_base_paths.cc',
         'base/ui_base_paths.h',
         'base/ui_base_switches.cc',
         'base/ui_base_switches.h',
         'base/ui_base_switches_util.cc',
         'base/ui_base_switches_util.h',
         'base/ui_base_types.cc',
         'base/ui_base_types.h',
         'base/ui_export.h',

[tfarina, 2013/11/12 19:26:36]

we (I) should rename this to ui_base_export.h.

         'base/view_prop.cc',
         'base/view_prop.h',
         'base/webui/jstemplate_builder.cc',
         'base/webui/jstemplate_builder.h',
         'base/webui/web_ui_util.cc',
         'base/webui/web_ui_util.h',
         'base/win/accessibility_ids_win.h',
         'base/win/accessibility_misc_utils.cc',
         'base/win/accessibility_misc_utils.h',
         'base/win/atl_module.h',
@@ skipping 336 matching lines @@
        'targets': [
          {
            'target_name': 'ui_jni_headers',
            'type': 'none',
            'direct_dependent_settings': {
              'include_dirs': [
                '<(SHARED_INTERMEDIATE_DIR)/ui',
              ],
            },
            'sources': [
-             'android/java/src/org/chromium/ui/Clipboard.java',
-             'android/java/src/org/chromium/ui/LocalizationUtils.java',
-             'android/java/src/org/chromium/ui/SelectFileDialog.java',
-             'android/java/src/org/chromium/ui/ViewAndroid.java',
-             'android/java/src/org/chromium/ui/WindowAndroid.java',
+             '../ui/base/android/java/src/org/chromium/ui/Clipboard.java',

[tfarina, 2013/11/12 19:26:36]

I'll move these files into:

ui/android/java/src/org/chromium/ui/base/

[Ted C, 2013/11/12 19:44:58]

sgtm

+             '../ui/base/android/java/src/org/chromium/ui/LocalizationUtils.java',
+             '../ui/base/android/java/src/org/chromium/ui/SelectFileDialog.java',
+             '../ui/base/android/java/src/org/chromium/ui/ViewAndroid.java',
+             '../ui/base/android/java/src/org/chromium/ui/WindowAndroid.java',
            ],
            'variables': {
              'jni_gen_package': 'ui',
            },
            'includes': [ '../build/jni_generator.gypi' ],
          },
          {
            'target_name': 'ui_java',
            'type': 'none',
            'variables': {
-             'java_in_dir': '../ui/android/java',
+             'java_in_dir': '../ui/base/android/java',
              'has_java_resources': 1,
              'R_package': 'org.chromium.ui',
              'R_package_relpath': 'org/chromium/ui',
              'java_strings_grd': 'android_ui_strings.grd',
            },
            'dependencies': [
              '../base/base.gyp:base_java',
              'window_open_disposition_java',
            ],
            'includes': [ '../build/java.gypi' ],
          },
          {
            'target_name': 'window_open_disposition_java',
            'type': 'none',
            'sources': [
-             'android/java/WindowOpenDisposition.template',
+             'base/android/java/WindowOpenDisposition.template',
            ],
            'variables': {
              'package_name': 'org/chromium/ui',
              'template_deps': ['base/window_open_disposition_list.h'],
            },
            'includes': [ '../build/android/java_cpp_template.gypi' ],
          },
        ],
     }],
     ['OS=="mac"', {
@@ skipping 61 matching lines @@
               'xcode_settings': {
                 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
               },
             }],
           ],
         },
       ],
     }],
   ],
 }