summaryrefslogtreecommitdiffstats
path: root/chrome/browser/background/background_contents_service.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 23:49:52 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 23:49:52 +0000
commitd2065e067f9747a14942bde7aa98711b776356e8 (patch)
tree9291c577204ba2feec91022ed204a92cea744c40 /chrome/browser/background/background_contents_service.h
parent2c4fcc993ec368bdfee6e30b25c7fff84ecc9202 (diff)
downloadchromium_src-d2065e067f9747a14942bde7aa98711b776356e8.zip
chromium_src-d2065e067f9747a14942bde7aa98711b776356e8.tar.gz
chromium_src-d2065e067f9747a14942bde7aa98711b776356e8.tar.bz2
Replace string16 with base::string16 in chrome/browser
TBR=sky Review URL: https://codereview.chromium.org/108123004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background/background_contents_service.h')
-rw-r--r--chrome/browser/background/background_contents_service.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h
index cfbf927..70e9318 100644
--- a/chrome/browser/background/background_contents_service.h
+++ b/chrome/browser/background/background_contents_service.h
@@ -204,7 +204,8 @@ class BackgroundContentsService : private content::NotificationObserver,
// applications.
// Key: application id
// Value: BackgroundContentsInfo for the BC associated with that application
- typedef std::map<string16, BackgroundContentsInfo> BackgroundContentsMap;
+ typedef std::map<base::string16, BackgroundContentsInfo>
+ BackgroundContentsMap;
BackgroundContentsMap contents_map_;
DISALLOW_COPY_AND_ASSIGN(BackgroundContentsService);