diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 23:58:45 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 23:58:45 +0000 |
| commit | dcd0249870cc1ead35ce6d3d8295b1c96a83aeb0 (patch) | |
| tree | de67c3f98feabf0222a0b82113c4c6d796117c0f /chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm | |
| parent | 8daeb41bb826c0908d1b5a2132c90a068ecf2c46 (diff) | |
| download | chromium_src-dcd0249870cc1ead35ce6d3d8295b1c96a83aeb0.zip chromium_src-dcd0249870cc1ead35ce6d3d8295b1c96a83aeb0.tar.gz chromium_src-dcd0249870cc1ead35ce6d3d8295b1c96a83aeb0.tar.bz2 | |
Use base namespace for string16 in chrome/browser.
This converts 200 more files.
TBR=sky
Review URL: https://codereview.chromium.org/108353004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm index 389ad2c..11b581f 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm @@ -111,7 +111,7 @@ void CollectedCookiesMac::OnConstrainedWindowClosed( #pragma mark Window Controller @interface CollectedCookiesWindowController(Private) --(void)showInfoBarForDomain:(const string16&)domain +-(void)showInfoBarForDomain:(const base::string16&)domain setting:(ContentSetting)setting; -(void)showInfoBarForMultipleDomainsAndSetting:(ContentSetting)setting; -(void)animateInfoBar; @@ -230,7 +230,7 @@ void CollectedCookiesMac::OnConstrainedWindowClosed( forTreeController:(NSTreeController*)controller { NSArray* nodes = [controller selectedNodes]; BOOL multipleDomainsChanged = NO; - string16 lastDomain; + base::string16 lastDomain; for (NSTreeNode* treeNode in nodes) { CocoaCookieTreeNode* node = [treeNode representedObject]; CookieTreeNode* cookie = static_cast<CookieTreeNode*>([node treeNode]); @@ -417,7 +417,7 @@ void CollectedCookiesMac::OnConstrainedWindowClosed( [self animateInfoBar]; } --(void)showInfoBarForDomain:(const string16&)domain +-(void)showInfoBarForDomain:(const base::string16&)domain setting:(ContentSetting)setting { NSString* label; switch (setting) { |