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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 11188020: Introduce Android variants of ChromeGeolocationPermissionContext, GeolocationConfirmInfoBarDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix conflict Created 8 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser', 9 'target_name': 'browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 'browser/fullscreen.h', 648 'browser/fullscreen.h',
649 'browser/fullscreen_ash.cc', 649 'browser/fullscreen_ash.cc',
650 'browser/fullscreen_aura.cc', 650 'browser/fullscreen_aura.cc',
651 'browser/fullscreen_gtk.cc', 651 'browser/fullscreen_gtk.cc',
652 'browser/fullscreen_mac.mm', 652 'browser/fullscreen_mac.mm',
653 'browser/fullscreen_win.cc', 653 'browser/fullscreen_win.cc',
654 'browser/geolocation/chrome_access_token_store.cc', 654 'browser/geolocation/chrome_access_token_store.cc',
655 'browser/geolocation/chrome_access_token_store.h', 655 'browser/geolocation/chrome_access_token_store.h',
656 'browser/geolocation/chrome_geolocation_permission_context.cc', 656 'browser/geolocation/chrome_geolocation_permission_context.cc',
657 'browser/geolocation/chrome_geolocation_permission_context.h', 657 'browser/geolocation/chrome_geolocation_permission_context.h',
658 'browser/geolocation/chrome_geolocation_permission_context_android.cc',
659 'browser/geolocation/chrome_geolocation_permission_context_android.h',
658 'browser/geolocation/geolocation_confirm_infobar_delegate.cc', 660 'browser/geolocation/geolocation_confirm_infobar_delegate.cc',
659 'browser/geolocation/geolocation_confirm_infobar_delegate.h', 661 'browser/geolocation/geolocation_confirm_infobar_delegate.h',
662 'browser/geolocation/geolocation_confirm_infobar_delegate_android.cc',
663 'browser/geolocation/geolocation_confirm_infobar_delegate_android.h',
660 'browser/geolocation/geolocation_infobar_queue_controller.cc', 664 'browser/geolocation/geolocation_infobar_queue_controller.cc',
661 'browser/geolocation/geolocation_infobar_queue_controller.h', 665 'browser/geolocation/geolocation_infobar_queue_controller.h',
666 'browser/geolocation/geolocation_infobar_queue_controller_android.cc',
667 'browser/geolocation/geolocation_infobar_queue_controller_android.h',
662 'browser/geolocation/geolocation_prefs.cc', 668 'browser/geolocation/geolocation_prefs.cc',
663 'browser/geolocation/geolocation_prefs.h', 669 'browser/geolocation/geolocation_prefs.h',
664 'browser/geolocation/geolocation_settings_state.cc', 670 'browser/geolocation/geolocation_settings_state.cc',
665 'browser/geolocation/geolocation_settings_state.h', 671 'browser/geolocation/geolocation_settings_state.h',
666 'browser/geolocation/wifi_data_provider_chromeos.cc', 672 'browser/geolocation/wifi_data_provider_chromeos.cc',
667 'browser/geolocation/wifi_data_provider_chromeos.h', 673 'browser/geolocation/wifi_data_provider_chromeos.h',
668 'browser/global_keyboard_shortcuts_mac.h', 674 'browser/global_keyboard_shortcuts_mac.h',
669 'browser/global_keyboard_shortcuts_mac.mm', 675 'browser/global_keyboard_shortcuts_mac.mm',
670 'browser/google/google_search_counter.cc', 676 'browser/google/google_search_counter.cc',
671 'browser/google/google_search_counter.h', 677 'browser/google/google_search_counter.h',
(...skipping 2219 matching lines...) Expand 10 before | Expand all | Expand 10 after
2891 'proto_in_dir': '../third_party/cros_system_api/dbus', 2897 'proto_in_dir': '../third_party/cros_system_api/dbus',
2892 'proto_out_dir': 'chrome/browser/media_transfer_protocol', 2898 'proto_out_dir': 'chrome/browser/media_transfer_protocol',
2893 }, 2899 },
2894 'includes': ['../build/protoc.gypi'], 2900 'includes': ['../build/protoc.gypi'],
2895 }, 2901 },
2896 ], 2902 ],
2897 }, 2903 },
2898 ], 2904 ],
2899 ], 2905 ],
2900 } 2906 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698