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

Side by Side Diff: trunk/src/chrome/chrome_browser.gypi

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 2935 matching lines...) Expand 10 before | Expand all | Expand 10 after
2946 'browser/renderer_host/pepper/pepper_platform_verification_message_f ilter.h', 2946 'browser/renderer_host/pepper/pepper_platform_verification_message_f ilter.h',
2947 ], 2947 ],
2948 }, { # chromeos==1 2948 }, { # chromeos==1
2949 'dependencies': [ 2949 'dependencies': [
2950 'browser_chromeos', 2950 'browser_chromeos',
2951 ], 2951 ],
2952 'sources!': [ 2952 'sources!': [
2953 'browser/first_run/upgrade_util.cc', 2953 'browser/first_run/upgrade_util.cc',
2954 'browser/first_run/upgrade_util.h', 2954 'browser/first_run/upgrade_util.h',
2955 'browser/first_run/upgrade_util_linux.cc', 2955 'browser/first_run/upgrade_util_linux.cc',
2956 'browser/fullscreen_aurax11.cc',
2957 'browser/icon_loader_auralinux.cc', 2956 'browser/icon_loader_auralinux.cc',
2958 'browser/idle_linux.cc', 2957 'browser/idle_linux.cc',
2959 'browser/password_manager/native_backend_gnome_x.cc', 2958 'browser/password_manager/native_backend_gnome_x.cc',
2960 'browser/password_manager/native_backend_gnome_x.h', 2959 'browser/password_manager/native_backend_gnome_x.h',
2961 'browser/password_manager/native_backend_kwallet_x.cc', 2960 'browser/password_manager/native_backend_kwallet_x.cc',
2962 'browser/password_manager/native_backend_kwallet_x.h', 2961 'browser/password_manager/native_backend_kwallet_x.h',
2963 'browser/platform_util_linux.cc', 2962 'browser/platform_util_linux.cc',
2964 'browser/policy/cloud/user_cloud_policy_manager_factory.cc', 2963 'browser/policy/cloud/user_cloud_policy_manager_factory.cc',
2965 'browser/policy/cloud/user_cloud_policy_manager_factory.h', 2964 'browser/policy/cloud/user_cloud_policy_manager_factory.h',
2966 'browser/policy/cloud/user_policy_signin_service.cc', 2965 'browser/policy/cloud/user_policy_signin_service.cc',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
3006 ['use_gnome_keyring==0', { 3005 ['use_gnome_keyring==0', {
3007 'sources!': [ 3006 'sources!': [
3008 'browser/password_manager/native_backend_gnome_x.cc', 3007 'browser/password_manager/native_backend_gnome_x.cc',
3009 'browser/password_manager/native_backend_gnome_x.h', 3008 'browser/password_manager/native_backend_gnome_x.h',
3010 ], 3009 ],
3011 }, { 3010 }, {
3012 'dependencies': [ 3011 'dependencies': [
3013 '../build/linux/system.gyp:gnome_keyring', 3012 '../build/linux/system.gyp:gnome_keyring',
3014 ], 3013 ],
3015 }], 3014 }],
3015 ['use_ash==1', {
3016 'sources!': [
3017 'browser/fullscreen_aurax11.cc',
3018 ],
3019 }],
3016 ['use_aura==1', { 3020 ['use_aura==1', {
3017 'sources/': [ 3021 'sources/': [
3018 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'], 3022 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
3019 ['exclude', '^browser/renderer_host/render_widget_host_view_views*'] , 3023 ['exclude', '^browser/renderer_host/render_widget_host_view_views*'] ,
3020 ], 3024 ],
3021 'dependencies': [ 3025 'dependencies': [
3022 '../ui/aura/aura.gyp:aura', 3026 '../ui/aura/aura.gyp:aura',
3023 '../ui/compositor/compositor.gyp:compositor', 3027 '../ui/compositor/compositor.gyp:compositor',
3024 '../ui/keyboard/keyboard.gyp:keyboard', 3028 '../ui/keyboard/keyboard.gyp:keyboard',
3025 ], 3029 ],
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
3711 'package_name': 'org/chromium/chrome/browser', 3715 'package_name': 'org/chromium/chrome/browser',
3712 'template_deps': ['browser/android/tab_load_status.h'], 3716 'template_deps': ['browser/android/tab_load_status.h'],
3713 }, 3717 },
3714 'includes': [ '../build/android/java_cpp_template.gypi' ], 3718 'includes': [ '../build/android/java_cpp_template.gypi' ],
3715 }, 3719 },
3716 ], 3720 ],
3717 }, 3721 },
3718 ], 3722 ],
3719 ], 3723 ],
3720 } 3724 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc ('k') | trunk/src/chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698