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

Side by Side Diff: app/app_base.gypi

Issue 6249007: Move BiDiLineIterator to base/i18n/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and fix the conflicts Created 9 years, 11 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 | « no previous file | base/base.gyp » ('j') | base/i18n/bidi_line_iterator.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'app_base_target': 0, 8 'app_base_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
11 # This part is shared between the targets defined below. Only files and 11 # This part is shared between the targets defined below. Only files and
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 '../ui/base/models/menu_model.cc', 142 '../ui/base/models/menu_model.cc',
143 '../ui/base/models/menu_model.h', 143 '../ui/base/models/menu_model.h',
144 '../ui/base/models/simple_menu_model.cc', 144 '../ui/base/models/simple_menu_model.cc',
145 '../ui/base/models/simple_menu_model.h', 145 '../ui/base/models/simple_menu_model.h',
146 '../ui/base/models/combobox_model.h', 146 '../ui/base/models/combobox_model.h',
147 '../ui/base/models/table_model.cc', 147 '../ui/base/models/table_model.cc',
148 '../ui/base/models/table_model.h', 148 '../ui/base/models/table_model.h',
149 '../ui/base/models/table_model_observer.h', 149 '../ui/base/models/table_model_observer.h',
150 'active_window_watcher_x.cc', 150 'active_window_watcher_x.cc',
151 'active_window_watcher_x.h', 151 'active_window_watcher_x.h',
152 'bidi_line_iterator.cc', 152 'combobox_model.h',
tony 2011/01/18 19:24:29 Did you mean to add this here?
tfarina 2011/01/18 19:34:47 No. It seems it was a merge conflict. I didn't rem
tfarina 2011/01/18 19:42:56 Removed.
153 'data_pack.cc', 153 'data_pack.cc',
154 'data_pack.h', 154 'data_pack.h',
155 'drag_drop_types_gtk.cc', 155 'drag_drop_types_gtk.cc',
156 'drag_drop_types_win.cc', 156 'drag_drop_types_win.cc',
157 'drag_drop_types.h', 157 'drag_drop_types.h',
158 'event_synthesis_gtk.cc', 158 'event_synthesis_gtk.cc',
159 'event_synthesis_gtk.h', 159 'event_synthesis_gtk.h',
160 'gfx/font_util.h', 160 'gfx/font_util.h',
161 'gfx/font_util.cc', 161 'gfx/font_util.cc',
162 'gfx/gl/gl_bindings.h', 162 'gfx/gl/gl_bindings.h',
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 'configurations': { 454 'configurations': {
455 'Common_Base': { 455 'Common_Base': {
456 'msvs_target_platform': 'x64', 456 'msvs_target_platform': 'x64',
457 }, 457 },
458 }, 458 },
459 }, 459 },
460 ], 460 ],
461 }], 461 }],
462 ], 462 ],
463 } 463 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gyp » ('j') | base/i18n/bidi_line_iterator.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698