diff options
26 files changed, 27 insertions, 27 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" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm index e912ff9..a25c381 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm @@ -4,8 +4,8 @@ #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" -#include "app/gfx/text_elider.h" #include "app/resource_bundle.h" +#include "app/text_elider.h" #include "base/sys_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm index 03ea922..aff63db 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm @@ -4,7 +4,7 @@ #import "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" -#include "app/gfx/text_elider.h" +#include "app/text_elider.h" #include "base/scoped_ptr.h" #include "base/sys_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" diff --git a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm b/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm index e5d7c40..26eced6 100644 --- a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm +++ b/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/text_elider.h" +#include "app/text_elider.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_dll_resource.h" // IDC_BOOKMARK_MENU #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/cocoa/download_item_cell.mm b/chrome/browser/cocoa/download_item_cell.mm index caa84f3..c48606a 100644 --- a/chrome/browser/cocoa/download_item_cell.mm +++ b/chrome/browser/cocoa/download_item_cell.mm @@ -5,8 +5,8 @@ #import "chrome/browser/cocoa/download_item_cell.h" #include "app/gfx/canvas_paint.h" -#include "app/gfx/text_elider.h" #include "app/l10n_util.h" +#include "app/text_elider.h" #include "base/mac_util.h" #include "base/sys_string_conversions.h" #import "chrome/browser/browser_theme_provider.h" diff --git a/chrome/browser/cocoa/download_item_controller.mm b/chrome/browser/cocoa/download_item_controller.mm index 682aa9d..02dcd660 100644 --- a/chrome/browser/cocoa/download_item_controller.mm +++ b/chrome/browser/cocoa/download_item_controller.mm @@ -4,9 +4,9 @@ #import "chrome/browser/cocoa/download_item_controller.h" -#include "app/gfx/text_elider.h" #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" +#include "app/text_elider.h" #include "base/mac_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/cocoa/history_menu_bridge.mm b/chrome/browser/cocoa/history_menu_bridge.mm index c40614b..342dca4 100644 --- a/chrome/browser/cocoa/history_menu_bridge.mm +++ b/chrome/browser/cocoa/history_menu_bridge.mm @@ -251,7 +251,7 @@ void HistoryMenuBridge::AddItemToMenu(HistoryItem* item, title = base::SysUTF8ToNSString(url_string); NSString* full_title = title; if (false && [title length] > kMaximumMenuWidthInChars) { - // TODO(rsesek): use app/gfx/text_elider.h once it uses string16 and can + // TODO(rsesek): use app/text_elider.h once it uses string16 and can // take out the middle of strings. title = [NSString stringWithFormat:@"%@…%@", [title substringToIndex:kMenuTrimSizeInChars], diff --git a/chrome/browser/cocoa/status_bubble_mac.mm b/chrome/browser/cocoa/status_bubble_mac.mm index 7f77029..ee58398 100644 --- a/chrome/browser/cocoa/status_bubble_mac.mm +++ b/chrome/browser/cocoa/status_bubble_mac.mm @@ -6,7 +6,7 @@ #include <limits> -#include "app/gfx/text_elider.h" +#include "app/text_elider.h" #include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/string_util.h" diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index f3b3ab4..4618085 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -7,10 +7,10 @@ #include <vector> #include "app/gfx/canvas_paint.h" -#include "app/gfx/text_elider.h" #include "app/gtk_dnd_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/text_elider.h" #include "base/pickle.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc index 98637e9..d455198 100644 --- a/chrome/browser/gtk/download_item_gtk.cc +++ b/chrome/browser/gtk/download_item_gtk.cc @@ -8,10 +8,10 @@ #include "app/l10n_util.h" #include "app/gfx/canvas_paint.h" #include "app/gfx/font.h" -#include "app/gfx/text_elider.h" #include "app/menus/simple_menu_model.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" +#include "app/text_elider.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/string_util.h" diff --git a/chrome/browser/gtk/status_bubble_gtk.cc b/chrome/browser/gtk/status_bubble_gtk.cc index df22b37..076cff5 100644 --- a/chrome/browser/gtk/status_bubble_gtk.cc +++ b/chrome/browser/gtk/status_bubble_gtk.cc @@ -8,8 +8,8 @@ #include <algorithm> -#include "app/gfx/text_elider.h" #include "app/l10n_util.h" +#include "app/text_elider.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_theme_provider.h" diff --git a/chrome/browser/possible_url_model.h b/chrome/browser/possible_url_model.h index 973a2dd..8f37f65 100644 --- a/chrome/browser/possible_url_model.h +++ b/chrome/browser/possible_url_model.h @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "app/gfx/text_elider.h" #include "app/table_model.h" +#include "app/text_elider.h" #include "base/string_util.h" #include "chrome/browser/history/history.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 5f1feac..a869687 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -4,9 +4,9 @@ #include "chrome/browser/tab_contents/tab_contents.h" -#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/text_elider.h" #include "base/auto_reset.h" #include "base/file_version_info.h" #include "base/process_util.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 65c1a3f..5954725 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -10,10 +10,10 @@ #include <vector> #include "app/gfx/canvas.h" -#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" +#include "app/text_elider.h" #include "base/string_util.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc index 9f48f4b..809fbba 100644 --- a/chrome/browser/views/constrained_window_win.cc +++ b/chrome/browser/views/constrained_window_win.cc @@ -6,9 +6,9 @@ #include "app/gfx/canvas.h" #include "app/gfx/font.h" -#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/text_elider.h" #include "app/win_util.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 05ec139..66e6ca7 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -7,9 +7,9 @@ #include <vector> #include "app/gfx/canvas.h" -#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/text_elider.h" #include "app/theme_provider.h" #include "base/callback.h" #include "base/file_path.h" diff --git a/chrome/browser/views/options/passwords_page_view.h b/chrome/browser/views/options/passwords_page_view.h index 7d196ff..2f065b3 100644 --- a/chrome/browser/views/options/passwords_page_view.h +++ b/chrome/browser/views/options/passwords_page_view.h @@ -7,8 +7,8 @@ #include <vector> -#include "app/gfx/text_elider.h" #include "app/table_model.h" +#include "app/text_elider.h" #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "chrome/browser/password_manager/password_store.h" diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index 32b2703..ff6ebc2 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -6,11 +6,11 @@ #include <algorithm> +#include "app/animation.h" #include "app/gfx/canvas.h" -#include "app/gfx/text_elider.h" #include "app/l10n_util.h" -#include "app/animation.h" #include "app/resource_bundle.h" +#include "app/text_elider.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/browser_theme_provider.h" diff --git a/printing/page_overlays.cc b/printing/page_overlays.cc index e01b02e..89353da 100644 --- a/printing/page_overlays.cc +++ b/printing/page_overlays.cc @@ -4,7 +4,7 @@ #include "printing/page_overlays.h" -#include "app/gfx/text_elider.h" +#include "app/text_elider.h" #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/printing/printed_document.cc b/printing/printed_document.cc index 7857859..bdbf4c8 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc @@ -10,7 +10,7 @@ #include <vector> #include "app/gfx/font.h" -#include "app/gfx/text_elider.h" +#include "app/text_elider.h" #include "base/file_util.h" #include "base/i18n/file_util_icu.h" #include "base/message_loop.h" diff --git a/views/controls/label.cc b/views/controls/label.cc index 4ba457b..b3d4e41 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -9,9 +9,9 @@ #include "app/gfx/canvas.h" #include "app/gfx/font.h" -#include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/text_elider.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "gfx/color_utils.h" diff --git a/views/widget/tooltip_manager.cc b/views/widget/tooltip_manager.cc index 32ac506..2a088b1 100644 --- a/views/widget/tooltip_manager.cc +++ b/views/widget/tooltip_manager.cc @@ -6,7 +6,7 @@ #include <vector> -#include "app/gfx/text_elider.h" +#include "app/text_elider.h" namespace views { |