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

Unified Diff: ui/views/window/non_client_view.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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/views/window/dialog_delegate_unittest.cc ('k') | ui/views/window/non_client_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/window/non_client_view.h
diff --git a/ui/views/window/non_client_view.h b/ui/views/window/non_client_view.h
index 2c3b1d9fe49e32c3f72fd5d1abac6ce0481384ee..ecfe984bcac6ce3264e1358fed454915983920bf 100644
--- a/ui/views/window/non_client_view.h
+++ b/ui/views/window/non_client_view.h
@@ -208,7 +208,7 @@ class VIEWS_EXPORT NonClientView : public View {
void LayoutFrameView();
// Set the accessible name of this view.
- void SetAccessibleName(const string16& name);
+ void SetAccessibleName(const base::string16& name);
// NonClientView, View overrides:
virtual gfx::Size GetPreferredSize() OVERRIDE;
@@ -243,7 +243,7 @@ class VIEWS_EXPORT NonClientView : public View {
View* overlay_view_;
// The accessible name of this view.
- string16 accessible_name_;
+ base::string16 accessible_name_;
DISALLOW_COPY_AND_ASSIGN(NonClientView);
};
« no previous file with comments | « ui/views/window/dialog_delegate_unittest.cc ('k') | ui/views/window/non_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698