chrome/chrome_browser_chromeos.gypi - Issue 12335051: Merge 182894 - 3rd attempt

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

Issue 12335051: Merge 182894 - 3rd attempt (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

Patch Set: Created 7 years, 10 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

« no previous file with comments | « chrome/browser/resources/chromeos/merge_session_load.html ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

OLD	NEW
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_chromeos',	9 'target_name': 'browser_chromeos',

10 'type': 'static_library',	10 'type': 'static_library',

(...skipping 396 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
407 'browser/chromeos/login/login_performer.h',	407 'browser/chromeos/login/login_performer.h',

408 'browser/chromeos/login/login_status_consumer.cc',	408 'browser/chromeos/login/login_status_consumer.cc',

409 'browser/chromeos/login/login_status_consumer.h',	409 'browser/chromeos/login/login_status_consumer.h',

410 'browser/chromeos/login/login_utils.cc',	410 'browser/chromeos/login/login_utils.cc',

411 'browser/chromeos/login/login_utils.h',	411 'browser/chromeos/login/login_utils.h',

412 'browser/chromeos/login/login_web_dialog.cc',	412 'browser/chromeos/login/login_web_dialog.cc',

413 'browser/chromeos/login/login_web_dialog.h',	413 'browser/chromeos/login/login_web_dialog.h',

414 'browser/chromeos/login/login_wizard.h',	414 'browser/chromeos/login/login_wizard.h',

415 'browser/chromeos/login/message_bubble.cc',	415 'browser/chromeos/login/message_bubble.cc',

416 'browser/chromeos/login/message_bubble.h',	416 'browser/chromeos/login/message_bubble.h',

	417 'browser/chromeos/login/merge_session_load_page.cc',

	418 'browser/chromeos/login/merge_session_load_page.h',

	419 'browser/chromeos/login/merge_session_throttle.cc',

	420 'browser/chromeos/login/merge_session_throttle.h',

417 'browser/chromeos/login/network_screen.cc',	421 'browser/chromeos/login/network_screen.cc',

418 'browser/chromeos/login/network_screen.h',	422 'browser/chromeos/login/network_screen.h',

419 'browser/chromeos/login/network_screen_actor.h',	423 'browser/chromeos/login/network_screen_actor.h',

420 'browser/chromeos/login/oauth1_login_manager.cc',	424 'browser/chromeos/login/oauth1_login_manager.cc',

421 'browser/chromeos/login/oauth1_login_manager.h',	425 'browser/chromeos/login/oauth1_login_manager.h',

422 'browser/chromeos/login/oauth2_login_manager.cc',	426 'browser/chromeos/login/oauth2_login_manager.cc',

423 'browser/chromeos/login/oauth2_login_manager.h',	427 'browser/chromeos/login/oauth2_login_manager.h',

424 'browser/chromeos/login/oauth_login_manager.cc',	428 'browser/chromeos/login/oauth_login_manager.cc',

425 'browser/chromeos/login/oauth_login_manager.h',	429 'browser/chromeos/login/oauth_login_manager.h',

426 'browser/chromeos/login/oauth1_login_verifier.cc',	430 'browser/chromeos/login/oauth1_login_verifier.cc',

(...skipping 361 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
788 'type': 'static_library',	792 'type': 'static_library',

789 'sources': [ 'browser/chromeos/drive/drive.proto' ],	793 'sources': [ 'browser/chromeos/drive/drive.proto' ],

790 'variables': {	794 'variables': {

791 'proto_in_dir': 'browser/chromeos/drive',	795 'proto_in_dir': 'browser/chromeos/drive',

792 'proto_out_dir': 'chrome/browser/chromeos/drive',	796 'proto_out_dir': 'chrome/browser/chromeos/drive',

793 },	797 },

794 'includes': [ '../build/protoc.gypi' ]	798 'includes': [ '../build/protoc.gypi' ]

795 },	799 },

796 ],	800 ],

797 }	801 }

OLD	NEW