Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm

Issue 6046009: Move base/mac_util.h to base/mac and use the base::mac namespace.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/l10n_util_mac.h" 8 #include "app/l10n_util_mac.h"
9 #include "base/mac_util.h" 9 #include "base/mac/mac_util.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" 12 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 14
15 @implementation BookmarkNameFolderController 15 @implementation BookmarkNameFolderController
16 16
17 // Common initializer (private). 17 // Common initializer (private).
18 - (id)initWithParentWindow:(NSWindow*)window 18 - (id)initWithParentWindow:(NSWindow*)window
19 profile:(Profile*)profile 19 profile:(Profile*)profile
20 node:(const BookmarkNode*)node 20 node:(const BookmarkNode*)node
21 parent:(const BookmarkNode*)parent 21 parent:(const BookmarkNode*)parent
22 newIndex:(int)newIndex { 22 newIndex:(int)newIndex {
23 NSString* nibpath = [mac_util::MainAppBundle() 23 NSString* nibpath = [base::mac::MainAppBundle()
24 pathForResource:@"BookmarkNameFolder" 24 pathForResource:@"BookmarkNameFolder"
25 ofType:@"nib"]; 25 ofType:@"nib"];
26 if ((self = [super initWithWindowNibPath:nibpath owner:self])) { 26 if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
27 parentWindow_ = window; 27 parentWindow_ = window;
28 profile_ = profile; 28 profile_ = profile;
29 node_ = node; 29 node_ = node;
30 parent_ = parent; 30 parent_ = parent;
31 newIndex_ = newIndex; 31 newIndex_ = newIndex;
32 if (parent) { 32 if (parent) {
33 DCHECK_LE(newIndex, parent->GetChildCount()); 33 DCHECK_LE(newIndex, parent->GetChildCount());
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 - (void)setFolderName:(NSString*)name { 115 - (void)setFolderName:(NSString*)name {
116 [nameField_ setStringValue:name]; 116 [nameField_ setStringValue:name];
117 } 117 }
118 118
119 - (NSButton*)okButton { 119 - (NSButton*)okButton {
120 return okButton_; 120 return okButton_;
121 } 121 }
122 122
123 @end // BookmarkNameFolderController 123 @end // BookmarkNameFolderController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698