summaryrefslogtreecommitdiffstats
path: root/remoting/host/disconnect_window_mac.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 23:47:45 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 23:47:45 +0000
commit2c4fcc993ec368bdfee6e30b25c7fff84ecc9202 (patch)
tree2f4743f5e9bd3f94ee53735aaafe25c168d2e42d /remoting/host/disconnect_window_mac.h
parent8bdded0fb5bdde0eec9b235b9876760f166e45b1 (diff)
downloadchromium_src-2c4fcc993ec368bdfee6e30b25c7fff84ecc9202.zip
chromium_src-2c4fcc993ec368bdfee6e30b25c7fff84ecc9202.tar.gz
chromium_src-2c4fcc993ec368bdfee6e30b25c7fff84ecc9202.tar.bz2
Replace string16 with base::string16 in gpu, media, and remoting.
R=piman@chromium.org, scherkus@chromium.org, sergeyu@chromium.org TBR=piman, scherkus, wez Review URL: https://codereview.chromium.org/114613002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/disconnect_window_mac.h')
-rw-r--r--remoting/host/disconnect_window_mac.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/host/disconnect_window_mac.h b/remoting/host/disconnect_window_mac.h
index 692a23d..7fd6115 100644
--- a/remoting/host/disconnect_window_mac.h
+++ b/remoting/host/disconnect_window_mac.h
@@ -15,7 +15,7 @@
@interface DisconnectWindowController : NSWindowController {
@private
base::Closure disconnect_callback_;
- string16 username_;
+ base::string16 username_;
IBOutlet NSTextField* connectedToField_;
IBOutlet NSButton* disconnectButton_;
}