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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/base.gyp » ('j') | base/i18n/bidi_line_iterator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/app_base.gypi
diff --git a/app/app_base.gypi b/app/app_base.gypi
index af50e100b1d3c423751b99df887ac94fd7ee4c4e..862884b616b8c151260e2f69f04601d59c8edc9c 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -149,7 +149,7 @@
'../ui/base/models/table_model_observer.h',
'active_window_watcher_x.cc',
'active_window_watcher_x.h',
- 'bidi_line_iterator.cc',
+ '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.
'data_pack.cc',
'data_pack.h',
'drag_drop_types_gtk.cc',
« 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