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

Side by Side Diff: ash/ash.gyp

Issue 10134036: Let Chrome app handle Ash accelerators first if the app is launched as a window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final rebase Created 8 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
« no previous file with comments | « ash/accelerators/focus_manager_factory.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 10
(...skipping 30 matching lines...) Expand all
41 'sources': [ 41 'sources': [
42 # All .cc, .h under ash, except unittests 42 # All .cc, .h under ash, except unittests
43 'accelerators/accelerator_controller.cc', 43 'accelerators/accelerator_controller.cc',
44 'accelerators/accelerator_controller.h', 44 'accelerators/accelerator_controller.h',
45 'accelerators/accelerator_dispatcher.cc', 45 'accelerators/accelerator_dispatcher.cc',
46 'accelerators/accelerator_dispatcher.h', 46 'accelerators/accelerator_dispatcher.h',
47 'accelerators/accelerator_filter.cc', 47 'accelerators/accelerator_filter.cc',
48 'accelerators/accelerator_filter.h', 48 'accelerators/accelerator_filter.h',
49 'accelerators/accelerator_table.cc', 49 'accelerators/accelerator_table.cc',
50 'accelerators/accelerator_table.h', 50 'accelerators/accelerator_table.h',
51 'accelerators/focus_manager_factory.cc',
52 'accelerators/focus_manager_factory.h',
51 'accelerators/nested_dispatcher_controller.cc', 53 'accelerators/nested_dispatcher_controller.cc',
52 'accelerators/nested_dispatcher_controller.h', 54 'accelerators/nested_dispatcher_controller.h',
53 'ash_switches.cc', 55 'ash_switches.cc',
54 'ash_switches.h', 56 'ash_switches.h',
55 'caps_lock_delegate.h', 57 'caps_lock_delegate.h',
56 'desktop_background/desktop_background_controller.cc', 58 'desktop_background/desktop_background_controller.cc',
57 'desktop_background/desktop_background_controller.h', 59 'desktop_background/desktop_background_controller.h',
58 'desktop_background/desktop_background_resources.cc', 60 'desktop_background/desktop_background_resources.cc',
59 'desktop_background/desktop_background_resources.h', 61 'desktop_background/desktop_background_resources.h',
60 'desktop_background/desktop_background_view.cc', 62 'desktop_background/desktop_background_view.cc',
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 'shell/cocoa/app-Info.plist', 524 'shell/cocoa/app-Info.plist',
523 ], 525 ],
524 'xcode_settings': { 526 'xcode_settings': {
525 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 527 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
526 }, 528 },
527 }], 529 }],
528 ], 530 ],
529 }, 531 },
530 ], 532 ],
531 } 533 }
OLDNEW
« no previous file with comments | « ash/accelerators/focus_manager_factory.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698