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

Unified Diff: ui/aura/window.h

Issue 15759009: ui/aura: Use base::string16 now that string16 was moved into base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 7 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
« no previous file with comments | « ui/aura/remote_root_window_host_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.h
diff --git a/ui/aura/window.h b/ui/aura/window.h
index e2c0d83bb97f748853635c24c18e93292c24a2fa..baf34f15663cffc72dbaef1a560e6c75c3810232 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -93,8 +93,8 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
const std::string& name() const { return name_; }
void SetName(const std::string& name);
- const string16 title() const { return title_; }
- void set_title(const string16& title) { title_ = title; }
+ const base::string16 title() const { return title_; }
+ void set_title(const base::string16& title) { title_ = title; }
bool transparent() const { return transparent_; }
void SetTransparent(bool transparent);
@@ -486,7 +486,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
int id_;
std::string name_;
- string16 title_;
+ base::string16 title_;
// Whether layer is initialized as non-opaque.
bool transparent_;
« no previous file with comments | « ui/aura/remote_root_window_host_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698