summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_view_mac.mm2
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm2
-rw-r--r--chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm2
-rw-r--r--chrome/browser/cocoa/download_item_cell.mm2
-rw-r--r--chrome/browser/cocoa/download_item_controller.mm2
-rw-r--r--chrome/browser/cocoa/history_menu_bridge.mm2
-rw-r--r--chrome/browser/cocoa/status_bubble_mac.mm2
-rw-r--r--chrome/browser/gtk/bookmark_bar_gtk.cc2
-rw-r--r--chrome/browser/gtk/download_item_gtk.cc2
-rw-r--r--chrome/browser/gtk/status_bubble_gtk.cc2
-rw-r--r--chrome/browser/possible_url_model.h2
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc2
-rw-r--r--chrome/browser/views/bookmark_bar_view.cc2
-rw-r--r--chrome/browser/views/constrained_window_win.cc2
-rw-r--r--chrome/browser/views/download_item_view.cc2
-rw-r--r--chrome/browser/views/options/passwords_page_view.h2
-rw-r--r--chrome/browser/views/status_bubble_views.cc4
17 files changed, 18 insertions, 18 deletions
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"
generated by cgit v1.1 at 2025-02-07 17:56:44 +0000