diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 08:20:56 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 08:20:56 +0000 |
| commit | 6145198177d58f79e7ed1b44fee883ea074fc5fa (patch) | |
| tree | 306253d68fa38b61d49da733316a31b6d377a7ca /app | |
| parent | eb776a32dcb148e37c7d5990161c6fff9f2f534a (diff) | |
| download | chromium_src-6145198177d58f79e7ed1b44fee883ea074fc5fa.zip chromium_src-6145198177d58f79e7ed1b44fee883ea074fc5fa.tar.gz chromium_src-6145198177d58f79e7ed1b44fee883ea074fc5fa.tar.bz2 | |
Move text_elider from app/gfx to app/
TBR=darin
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.gyp | 2 | ||||
| -rw-r--r-- | app/app_base.gypi | 4 | ||||
| -rw-r--r-- | app/text_elider.cc (renamed from app/gfx/text_elider.cc) | 2 | ||||
| -rw-r--r-- | app/text_elider.h (renamed from app/gfx/text_elider.h) | 0 | ||||
| -rw-r--r-- | app/text_elider_unittest.cc (renamed from app/gfx/text_elider_unittest.cc) | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/app/app.gyp b/app/app.gyp index d0418dd..efd11c9 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -40,13 +40,13 @@ 'animation_unittest.cc', 'clipboard/clipboard_unittest.cc', 'gfx/font_unittest.cc', - 'gfx/text_elider_unittest.cc', 'l10n_util_mac_unittest.mm', 'l10n_util_unittest.cc', 'os_exchange_data_win_unittest.cc', 'run_all_unittests.cc', 'system_monitor_unittest.cc', 'test_suite.h', + 'text_elider_unittest.cc', 'sql/connection_unittest.cc', 'sql/statement_unittest.cc', 'sql/transaction_unittest.cc', diff --git a/app/app_base.gypi b/app/app_base.gypi index df49c71..b417256 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -121,8 +121,6 @@ 'gfx/font_util.h', 'gfx/font_util.cc', 'gfx/font_win.cc', - 'gfx/text_elider.cc', - 'gfx/text_elider.h', 'gtk_dnd_util.cc', 'gtk_dnd_util.h', 'gtk_signal.h', @@ -168,6 +166,8 @@ 'table_model.cc', 'table_model.h', 'table_model_observer.h', + 'text_elider.cc', + 'text_elider.h', 'theme_provider.cc', 'theme_provider.h', 'throb_animation.cc', diff --git a/app/gfx/text_elider.cc b/app/text_elider.cc index c96c731..21d5201 100644 --- a/app/gfx/text_elider.cc +++ b/app/text_elider.cc @@ -5,7 +5,7 @@ #include <vector> #include "app/gfx/font.h" -#include "app/gfx/text_elider.h" +#include "app/text_elider.h" #include "app/l10n_util.h" #include "base/file_path.h" #include "base/string_util.h" diff --git a/app/gfx/text_elider.h b/app/text_elider.h index aa33c29..aa33c29 100644 --- a/app/gfx/text_elider.h +++ b/app/text_elider.h diff --git a/app/gfx/text_elider_unittest.cc b/app/text_elider_unittest.cc index 385d92d..f8a30ef 100644 --- a/app/gfx/text_elider_unittest.cc +++ b/app/text_elider_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "app/gfx/font.h" -#include "app/gfx/text_elider.h" +#include "app/text_elider.h" #include "app/l10n_util.h" #include "base/file_path.h" #include "base/string_util.h" |