diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 18:20:14 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 18:20:14 +0000 |
| commit | 0378bf4edc40686bac06c8e14bd25fdb3f9cfb28 (patch) | |
| tree | ee5543b43dd9743d75e1aa8f16692dcfca6c813f /gfx | |
| parent | d028296ec1c0fdfbd40e2390ca3121de7055295d (diff) | |
| download | chromium_src-0378bf4edc40686bac06c8e14bd25fdb3f9cfb28.zip chromium_src-0378bf4edc40686bac06c8e14bd25fdb3f9cfb28.tar.gz chromium_src-0378bf4edc40686bac06c8e14bd25fdb3f9cfb28.tar.bz2 | |
Move base/mac_util.h to base/mac and use the base::mac namespace.
Fix up callers to use the new location & namespace. Remove includes from
files where it wasn't necessary.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6046009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/blit.cc | 1 | ||||
| -rw-r--r-- | gfx/scoped_image.h | 4 | ||||
| -rw-r--r-- | gfx/scoped_image_unittest.cc | 4 | ||||
| -rw-r--r-- | gfx/test_suite.h | 14 |
4 files changed, 11 insertions, 12 deletions
diff --git a/gfx/blit.cc b/gfx/blit.cc index 88d4057..8853339 100644 --- a/gfx/blit.cc +++ b/gfx/blit.cc @@ -16,7 +16,6 @@ #endif #if defined(OS_MACOSX) -#include "base/mac_util.h" #include "base/mac/scoped_cftyperef.h" #endif diff --git a/gfx/scoped_image.h b/gfx/scoped_image.h index c539a94..56e99b7 100644 --- a/gfx/scoped_image.h +++ b/gfx/scoped_image.h @@ -14,7 +14,7 @@ #if defined(OS_LINUX) #include <glib-object.h> #elif defined(OS_MACOSX) -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #endif namespace gfx { @@ -106,7 +106,7 @@ class ScopedImage<NSImage> : public gfx::internal::ScopedImage<NSImage> { } virtual void Free() { - mac_util::NSObjectRelease(image_); + base::mac::NSObjectRelease(image_); image_ = NULL; } diff --git a/gfx/scoped_image_unittest.cc b/gfx/scoped_image_unittest.cc index c43dd43..8e8b312 100644 --- a/gfx/scoped_image_unittest.cc +++ b/gfx/scoped_image_unittest.cc @@ -10,7 +10,7 @@ #if defined(OS_LINUX) #include "gfx/gtk_util.h" #elif defined(OS_MACOSX) -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "skia/ext/skia_utils_mac.h" #endif @@ -30,7 +30,7 @@ class ScopedImageTest : public testing::Test { scoped_ptr<SkBitmap> bitmap(CreateBitmap()); #if defined(OS_MACOSX) NSImage* image = gfx::SkBitmapToNSImage(*(bitmap.get())); - mac_util::NSObjectRetain(image); + base::mac::NSObjectRetain(image); return image; #elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS) return gfx::GdkPixbufFromSkBitmap(bitmap.get()); diff --git a/gfx/test_suite.h b/gfx/test_suite.h index 8803c7c..8e09e35 100644 --- a/gfx/test_suite.h +++ b/gfx/test_suite.h @@ -6,18 +6,18 @@ #define GFX_TEST_SUITE_H_ #pragma once -#include "build/build_config.h" - #include <string> #include "gfx/gfx_paths.h" #include "base/file_path.h" #include "base/path_service.h" -#if defined(OS_MACOSX) -#include "base/mac_util.h" -#endif #include "base/mac/scoped_nsautorelease_pool.h" #include "base/test/test_suite.h" +#include "build/build_config.h" + +#if defined(OS_MACOSX) +#include "base/mac/mac_util.h" +#endif class GfxTestSuite : public base::TestSuite { public: @@ -47,13 +47,13 @@ class GfxTestSuite : public base::TestSuite { #else #error Unknown branding #endif - mac_util::SetOverrideAppBundlePath(path); + base::mac::SetOverrideAppBundlePath(path); #endif // OS_MACOSX } virtual void Shutdown() { #if defined(OS_MACOSX) - mac_util::SetOverrideAppBundle(NULL); + base::mac::SetOverrideAppBundle(NULL); #endif TestSuite::Shutdown(); } |