Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm
===================================================================
--- chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm (revision 71854)
+++ chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm (working copy)
@@ -4,12 +4,12 @@
#import "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
-#include "app/text_elider.h"
#include "base/scoped_ptr.h"
#include "base/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "testing/platform_test.h"
+#include "ui/base/text/text_elider.h"
namespace {
@@ -461,7 +461,7 @@
// When elided, result is the same as ElideText().
ret = AutocompletePopupViewMac::ElideString(as, wideContents, font_, kNarrow);
- std::wstring elided(UTF16ToWideHack(ElideText(WideToUTF16Hack(
+ std::wstring elided(UTF16ToWideHack(ui::ElideText(WideToUTF16Hack(
wideContents), font_, kNarrow, false)));
EXPECT_TRUE(ret == as);
EXPECT_FALSE([[as string] isEqualToString:contents]);
@@ -469,7 +469,7 @@
// When elided, result is the same as ElideText().
ret = AutocompletePopupViewMac::ElideString(as, wideContents, font_, 0.0);
- elided = UTF16ToWideHack(ElideText(WideToUTF16Hack(wideContents), font_,
+ elided = UTF16ToWideHack(ui::ElideText(WideToUTF16Hack(wideContents), font_,
0.0, false));
EXPECT_TRUE(ret == as);
EXPECT_FALSE([[as string] isEqualToString:contents]);
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_popup_view_mac.mm ('k') | chrome/browser/autofill/autofill_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698