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

Unified Diff: ui/oak/oak_aura_window_display.cc

Issue 89243003: Move EmptyString, kWhitespace and the BOM to base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « ui/compositor/compositor.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/oak/oak_aura_window_display.cc
diff --git a/ui/oak/oak_aura_window_display.cc b/ui/oak/oak_aura_window_display.cc
index 18323f8766cac84e4ee6e02fe5b96d89724324c5..e751a332393ff0bcceafecbbad668c0085d09f36 100644
--- a/ui/oak/oak_aura_window_display.cc
+++ b/ui/oak/oak_aura_window_display.cc
@@ -99,7 +99,7 @@ int OakAuraWindowDisplay::RowCount() {
base::string16 OakAuraWindowDisplay::GetText(int row, int column_id) {
if (!window_)
- return EmptyString16();
+ return base::string16();
base::string16 text;
switch (row) {
@@ -153,7 +153,7 @@ base::string16 OakAuraWindowDisplay::GetText(int row, int column_id) {
NOTREACHED();
break;
}
- return EmptyString16();
+ return base::string16();
}
void OakAuraWindowDisplay::SetObserver(ui::TableModelObserver* observer) {
« no previous file with comments | « ui/compositor/compositor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698