summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_menu_manager.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-22 22:26:53 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-22 22:26:53 +0000
commit62cfbad7377b4db2497fec6e88821a36a1b767fe (patch)
treec7be44ea69ddb94285d7a779ade049411fb004e1 /chrome/browser/extensions/extension_menu_manager.cc
parent078ed5486f50579a03463961738f6d57759d10ce (diff)
downloadchromium_src-62cfbad7377b4db2497fec6e88821a36a1b767fe.zip
chromium_src-62cfbad7377b4db2497fec6e88821a36a1b767fe.tar.gz
chromium_src-62cfbad7377b4db2497fec6e88821a36a1b767fe.tar.bz2
(shlib failure) Revert 97750 - content: Move render_widget_host_view_gtk to content/
This also moves some other files: - OwnedWidgetGtk now goes in ui/base/gtk/ - TruncateString moved from l10n_util:: to ui:: - GtkIMContextWrapper has part of its code split into chrome/ (IDC using code goes in RenderViewContextMenu) and the rest go in content/ (gtk using code goes with GtkIMContextWrapper). - gtk_key_bindings_handler[_unittest] now goes in content, as it's a utility class to RenderWidgetHostGtk. BUG=93804 TEST=existing unit tests Review URL: http://codereview.chromium.org/7669040 TBR=erg@google.com Review URL: http://codereview.chromium.org/7708017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97756 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_menu_manager.cc')
-rw-r--r--chrome/browser/extensions/extension_menu_manager.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_menu_manager.cc b/chrome/browser/extensions/extension_menu_manager.cc
index 8cc81c2..a510392 100644
--- a/chrome/browser/extensions/extension_menu_manager.cc
+++ b/chrome/browser/extensions/extension_menu_manager.cc
@@ -18,7 +18,7 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/extension.h"
#include "content/common/notification_service.h"
-#include "ui/base/text/text_elider.h"
+#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/favicon_size.h"
#include "webkit/glue/context_menu.h"
@@ -76,7 +76,7 @@ string16 ExtensionMenuItem::TitleWithReplacement(
ReplaceSubstringsAfterOffset(&result, 0, ASCIIToUTF16("%s"), selection);
if (result.length() > max_length)
- result = ui::TruncateString(result, max_length);
+ result = l10n_util::TruncateString(result, max_length);
return result;
}