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 /chrome/plugin | |
| 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 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/plugin_thread.cc | 4 | ||||
| -rw-r--r-- | chrome/plugin/webplugin_proxy.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index 399da12..1400e4a 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -41,7 +41,7 @@ #include "app/x11_util.h" #elif defined(OS_MACOSX) #include "app/l10n_util.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/sys_string_conversions.h" #include "grit/chromium_strings.h" @@ -100,7 +100,7 @@ PluginThread::PluginThread() base::mac::ScopedCFTypeRef<CFStringRef> process_name( CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ (%@)"), plugin_name.get(), app_name.get())); - mac_util::SetProcessName(process_name); + base::mac::SetProcessName(process_name); #endif } diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index 1d7a077..8aeed6c 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -24,7 +24,7 @@ #include "webkit/plugins/npapi/webplugin_delegate_impl.h" #if defined(OS_MACOSX) -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "chrome/plugin/webplugin_accelerated_surface_proxy_mac.h" #endif @@ -573,7 +573,7 @@ void WebPluginProxy::SetWindowlessBuffer( window_rect.width(), window_rect.height(), 8, 4 * window_rect.width(), - mac_util::GetSystemColorSpace(), + base::mac::GetSystemColorSpace(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host)); CGContextTranslateCTM(windowless_context_, 0, window_rect.height()); @@ -584,7 +584,7 @@ void WebPluginProxy::SetWindowlessBuffer( window_rect.width(), window_rect.height(), 8, 4 * window_rect.width(), - mac_util::GetSystemColorSpace(), + base::mac::GetSystemColorSpace(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host)); CGContextTranslateCTM(background_context_, 0, window_rect.height()); |