summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-19 13:59:59 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-19 13:59:59 +0000
commit46821242173a097387516ad48ac12fa173a5828d (patch)
tree169709fcef1b35b582ea32730b500d248c341a15 /chrome/common
parentcbcdc40ba3c71c2a01ae29fae593bff8f097b4c7 (diff)
downloadchromium_src-46821242173a097387516ad48ac12fa173a5828d.zip
chromium_src-46821242173a097387516ad48ac12fa173a5828d.tar.gz
chromium_src-46821242173a097387516ad48ac12fa173a5828d.tar.bz2
Move Mac-specific files in chrome/common to chrome/common/mac.
BUG=none TEST=none Review URL: http://codereview.chromium.org/7691001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/mac/DEPS0
-rw-r--r--chrome/common/mac/OWNERS4
-rw-r--r--chrome/common/mac/app_mode_common.h (renamed from chrome/common/app_mode_common_mac.h)6
-rw-r--r--chrome/common/mac/app_mode_common.mm (renamed from chrome/common/app_mode_common_mac.mm)2
-rw-r--r--chrome/common/mac/attributed_string_coder.h (renamed from chrome/common/attributed_string_coder_mac.h)7
-rw-r--r--chrome/common/mac/attributed_string_coder.mm (renamed from chrome/common/attributed_string_coder_mac.mm)2
-rw-r--r--chrome/common/mac/attributed_string_coder_unittest.mm (renamed from chrome/common/attributed_string_coder_mac_unittest.mm)2
-rw-r--r--chrome/common/mac/cfbundle_blocker.h0
-rw-r--r--chrome/common/mac/cfbundle_blocker.mm0
-rw-r--r--chrome/common/mac/launchd.h (renamed from chrome/common/launchd_mac.h)7
-rw-r--r--chrome/common/mac/launchd.mm (renamed from chrome/common/launchd_mac.mm)2
-rw-r--r--chrome/common/service_process_util_mac.mm2
-rw-r--r--chrome/common/service_process_util_unittest.cc2
-rw-r--r--chrome/common/text_input_client_messages.h2
14 files changed, 22 insertions, 16 deletions
diff --git a/chrome/common/mac/DEPS b/chrome/common/mac/DEPS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/chrome/common/mac/DEPS
diff --git a/chrome/common/mac/OWNERS b/chrome/common/mac/OWNERS
new file mode 100644
index 0000000..dc83bad
--- /dev/null
+++ b/chrome/common/mac/OWNERS
@@ -0,0 +1,4 @@
+mark@chromium.org
+thomasvl@chromium.org
+thakis@chromium.org
+rsesek@chromium.org
diff --git a/chrome/common/app_mode_common_mac.h b/chrome/common/mac/app_mode_common.h
index 9f74427..4fd258c 100644
--- a/chrome/common/app_mode_common_mac.h
+++ b/chrome/common/mac/app_mode_common.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_COMMON_APP_MODE_COMMON_MAC_H_
-#define CHROME_COMMON_APP_MODE_COMMON_MAC_H_
+#ifndef CHROME_COMMON_MAC_APP_MODE_COMMON_H_
+#define CHROME_COMMON_MAC_APP_MODE_COMMON_H_
#pragma once
#include <CoreFoundation/CoreFoundation.h>
@@ -64,4 +64,4 @@ struct ChromeAppModeInfo {
} // namespace app_mode
-#endif // CHROME_COMMON_APP_MODE_COMMON_MAC_H_
+#endif // CHROME_COMMON_MAC_APP_MODE_COMMON_H_
diff --git a/chrome/common/app_mode_common_mac.mm b/chrome/common/mac/app_mode_common.mm
index 781ff2f..4f8ebbd 100644
--- a/chrome/common/app_mode_common_mac.mm
+++ b/chrome/common/mac/app_mode_common.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/common/app_mode_common_mac.h"
+#include "chrome/common/mac/app_mode_common.h"
namespace app_mode {
diff --git a/chrome/common/attributed_string_coder_mac.h b/chrome/common/mac/attributed_string_coder.h
index 4ac02eb..bbaeb82 100644
--- a/chrome/common/attributed_string_coder_mac.h
+++ b/chrome/common/mac/attributed_string_coder.h
@@ -2,8 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_COMMON_ATTRIBUTED_STRING_CODER_MAC_H_
-#define CHROME_COMMON_ATTRIBUTED_STRING_CODER_MAC_H_
+#ifndef CHROME_COMMON_MAC_ATTRIBUTED_STRING_CODER_H_
+#define CHROME_COMMON_MAC_ATTRIBUTED_STRING_CODER_H_
+#pragma once
#include <set>
@@ -115,4 +116,4 @@ struct ParamTraits<mac::AttributedStringCoder::FontAttribute> {
} // namespace IPC
-#endif // CHROME_COMMON_ATTRIBUTED_STRING_CODER_MAC_H_
+#endif // CHROME_COMMON_MAC_ATTRIBUTED_STRING_CODER_H_
diff --git a/chrome/common/attributed_string_coder_mac.mm b/chrome/common/mac/attributed_string_coder.mm
index 793d3fb..7078f4b 100644
--- a/chrome/common/attributed_string_coder_mac.mm
+++ b/chrome/common/mac/attributed_string_coder.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/common/attributed_string_coder_mac.h"
+#include "chrome/common/mac/attributed_string_coder.h"
#include <AppKit/AppKit.h>
diff --git a/chrome/common/attributed_string_coder_mac_unittest.mm b/chrome/common/mac/attributed_string_coder_unittest.mm
index bf7ebff..b099a0f 100644
--- a/chrome/common/attributed_string_coder_mac_unittest.mm
+++ b/chrome/common/mac/attributed_string_coder_unittest.mm
@@ -7,7 +7,7 @@
#include "base/memory/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/utf_string_conversions.h"
-#import "chrome/common/attributed_string_coder_mac.h"
+#import "chrome/common/mac/attributed_string_coder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h"
diff --git a/chrome/common/mac/cfbundle_blocker.h b/chrome/common/mac/cfbundle_blocker.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/chrome/common/mac/cfbundle_blocker.h
diff --git a/chrome/common/mac/cfbundle_blocker.mm b/chrome/common/mac/cfbundle_blocker.mm
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/chrome/common/mac/cfbundle_blocker.mm
diff --git a/chrome/common/launchd_mac.h b/chrome/common/mac/launchd.h
index ebf64ae..8344d87 100644
--- a/chrome/common/launchd_mac.h
+++ b/chrome/common/mac/launchd.h
@@ -2,8 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_COMMON_LAUNCHD_MAC_H_
-#define CHROME_COMMON_LAUNCHD_MAC_H_
+#ifndef CHROME_COMMON_MAC_LAUNCHD_H_
+#define CHROME_COMMON_MAC_LAUNCHD_H_
+#pragma once
#include <CoreFoundation/CoreFoundation.h>
@@ -97,4 +98,4 @@ class Launchd {
DISALLOW_COPY_AND_ASSIGN(Launchd);
};
-#endif // CHROME_COMMON_LAUNCHD_MAC_H_
+#endif // CHROME_COMMON_MAC_LAUNCHD_H_
diff --git a/chrome/common/launchd_mac.mm b/chrome/common/mac/launchd.mm
index 7d28390..8bad675 100644
--- a/chrome/common/launchd_mac.mm
+++ b/chrome/common/mac/launchd.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/common/launchd_mac.h"
+#include "chrome/common/mac/launchd.h"
#import <Foundation/Foundation.h>
#include <launch.h>
diff --git a/chrome/common/service_process_util_mac.mm b/chrome/common/service_process_util_mac.mm
index 58bcc4a..7923a1a 100644
--- a/chrome/common/service_process_util_mac.mm
+++ b/chrome/common/service_process_util_mac.mm
@@ -26,7 +26,7 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
-#include "chrome/common/launchd_mac.h"
+#include "chrome/common/mac/launchd.h"
#include "content/common/child_process_host.h"
using ::base::files::FilePathWatcher;
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index 4f757fc..8d38347 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -250,7 +250,7 @@ MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestShutdown) {
#include "base/sys_string_conversions.h"
#include "base/test/test_timeouts.h"
#include "base/threading/thread.h"
-#include "chrome/common/launchd_mac.h"
+#include "chrome/common/mac/launchd.h"
#include "testing/gtest/include/gtest/gtest.h"
// TODO(dmaclach): Write this in terms of a real mock.
diff --git a/chrome/common/text_input_client_messages.h b/chrome/common/text_input_client_messages.h
index b5a523c..5ed66ad 100644
--- a/chrome/common/text_input_client_messages.h
+++ b/chrome/common/text_input_client_messages.h
@@ -9,7 +9,7 @@
#include "ui/gfx/rect.h"
#if defined(OS_MACOSX)
-#include "chrome/common/attributed_string_coder_mac.h"
+#include "chrome/common/mac/attributed_string_coder.h"
#endif
#define IPC_MESSAGE_START TextInputClientMsgStart