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/browser/ui/cocoa/download | |
| 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/browser/ui/cocoa/download')
3 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index d2a8335..db5d5fa 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -6,7 +6,6 @@ #include "app/l10n_util.h" #include "app/text_elider.h" -#include "base/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_item_model.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm index be0be80..23603f8 100644 --- a/chrome/browser/ui/cocoa/download/download_item_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm @@ -7,7 +7,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" #include "app/text_elider.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/metrics/histogram.h" #include "base/string16.h" #include "base/string_util.h" @@ -98,7 +98,7 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu { - (id)initWithModel:(BaseDownloadItemModel*)downloadModel shelf:(DownloadShelfController*)shelf { if ((self = [super initWithNibName:@"DownloadItem" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { // Must be called before [self view], so that bridge_ is set in awakeFromNib bridge_.reset(new DownloadItemMac(downloadModel, self)); menuBridge_.reset(new DownloadShelfContextMenuMac(downloadModel)); diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm index 4238b98..f88071f 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" @@ -83,7 +83,7 @@ const NSTimeInterval kAutoCloseDelaySeconds = 5; - (id)initWithBrowser:(Browser*)browser resizeDelegate:(id<ViewResizer>)resizeDelegate { if ((self = [super initWithNibName:@"DownloadShelf" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { resizeDelegate_ = resizeDelegate; maxShelfHeight_ = NSHeight([[self view] bounds]); currentShelfHeight_ = maxShelfHeight_; |