summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 08:20:56 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 08:20:56 +0000
commit6145198177d58f79e7ed1b44fee883ea074fc5fa (patch)
tree306253d68fa38b61d49da733316a31b6d377a7ca /chrome/browser/views
parenteb776a32dcb148e37c7d5990161c6fff9f2f534a (diff)
downloadchromium_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 'chrome/browser/views')
-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
5 files changed, 6 insertions, 6 deletions
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"