summaryrefslogtreecommitdiffstats
path: root/chrome/common/mac
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 00:49:49 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 00:49:49 +0000
commit3c8a6b02d4f00e36e06c17ebcd683ed1d168f9b9 (patch)
tree44e904a375941185a9aaf427fb9b3242ce11402a /chrome/common/mac
parentb95ff9ed7c31295c6a1e45a99ffef2701855ee50 (diff)
downloadchromium_src-3c8a6b02d4f00e36e06c17ebcd683ed1d168f9b9.zip
chromium_src-3c8a6b02d4f00e36e06c17ebcd683ed1d168f9b9.tar.gz
chromium_src-3c8a6b02d4f00e36e06c17ebcd683ed1d168f9b9.tar.bz2
Use a direct include of strings headers in chrome/common/, part 2.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16579006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/mac')
-rw-r--r--chrome/common/mac/app_mode_chrome_locator.h2
-rw-r--r--chrome/common/mac/app_mode_common.h2
-rw-r--r--chrome/common/mac/launchd.mm2
-rw-r--r--chrome/common/mac/mock_launchd.cc4
-rw-r--r--chrome/common/mac/objc_zombie.mm2
5 files changed, 6 insertions, 6 deletions
diff --git a/chrome/common/mac/app_mode_chrome_locator.h b/chrome/common/mac/app_mode_chrome_locator.h
index e7da4c4..f5e7a3e 100644
--- a/chrome/common/mac/app_mode_chrome_locator.h
+++ b/chrome/common/mac/app_mode_chrome_locator.h
@@ -7,7 +7,7 @@
#include <CoreFoundation/CoreFoundation.h>
-#include "base/string16.h"
+#include "base/strings/string16.h"
@class NSString;
diff --git a/chrome/common/mac/app_mode_common.h b/chrome/common/mac/app_mode_common.h
index b9045a6..d397c4b 100644
--- a/chrome/common/mac/app_mode_common.h
+++ b/chrome/common/mac/app_mode_common.h
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
// This file contains constants, interfaces, etc. which are common to the
// browser application and the app mode loader (a.k.a. shim).
diff --git a/chrome/common/mac/launchd.mm b/chrome/common/mac/launchd.mm
index 6d14523..31dbba3 100644
--- a/chrome/common/mac/launchd.mm
+++ b/chrome/common/mac/launchd.mm
@@ -11,7 +11,7 @@
#include "base/mac/scoped_cftyperef.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/process_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "third_party/GTM/Foundation/GTMServiceManagement.h"
diff --git a/chrome/common/mac/mock_launchd.cc b/chrome/common/mac/mock_launchd.cc
index b7aca6c..bc08bf8 100644
--- a/chrome/common/mac/mock_launchd.cc
+++ b/chrome/common/mac/mock_launchd.cc
@@ -15,8 +15,8 @@
#include "base/mac/scoped_cftyperef.h"
#include "base/message_loop.h"
#include "base/process_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/mac/launchd.h"
diff --git a/chrome/common/mac/objc_zombie.mm b/chrome/common/mac/objc_zombie.mm
index b71cda7..8f64840 100644
--- a/chrome/common/mac/objc_zombie.mm
+++ b/chrome/common/mac/objc_zombie.mm
@@ -15,7 +15,7 @@
#include "base/debug/stack_trace.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/synchronization/lock.h"
#include "chrome/common/crash_keys.h"
#import "chrome/common/mac/objc_method_swizzle.h"