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

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

Issue 10834161: Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/mac/bundle_locations.h" 7 #include "base/mac/bundle_locations.h"
8 #include "base/mac/mac_util.h" 8 #include "base/mac/mac_util.h"
9 #include "base/sys_string_conversions.h" 9 #include "base/sys_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_cell_single_line.h" 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_cell_single_line.h"
12 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" 13 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"
13 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
14 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
15 #include "ui/base/l10n/l10n_util_mac.h" 16 #include "ui/base/l10n/l10n_util_mac.h"
16 17
17 @implementation BookmarkNameFolderController 18 @implementation BookmarkNameFolderController
18 19
19 // Common initializer (private). 20 // Common initializer (private).
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 [nameField_ setStringValue:initialName_.get()]; 73 [nameField_ setStringValue:initialName_.get()];
73 [[nameField_ cell] setUsesSingleLineMode:YES]; 74 [[nameField_ cell] setUsesSingleLineMode:YES];
74 75
75 [okButton_ setTitle:l10n_util::GetNSStringWithFixup(node_ ? IDS_SAVE : 76 [okButton_ setTitle:l10n_util::GetNSStringWithFixup(node_ ? IDS_SAVE :
76 IDS_ADD)]; 77 IDS_ADD)];
77 } 78 }
78 79
79 - (void)runAsModalSheet { 80 - (void)runAsModalSheet {
80 // Ping me when things change out from under us. 81 // Ping me when things change out from under us.
81 observer_.reset(new BookmarkModelObserverForCocoa( 82 observer_.reset(new BookmarkModelObserverForCocoa(
82 node_, profile_->GetBookmarkModel(), 83 node_, BookmarkModelFactory::GetForProfile(profile_),
83 self, 84 self,
84 @selector(cancel:))); 85 @selector(cancel:)));
85 [NSApp beginSheet:[self window] 86 [NSApp beginSheet:[self window]
86 modalForWindow:parentWindow_ 87 modalForWindow:parentWindow_
87 modalDelegate:self 88 modalDelegate:self
88 didEndSelector:@selector(didEndSheet:returnCode:contextInfo:) 89 didEndSelector:@selector(didEndSheet:returnCode:contextInfo:)
89 contextInfo:nil]; 90 contextInfo:nil];
90 } 91 }
91 92
92 - (IBAction)cancel:(id)sender { 93 - (IBAction)cancel:(id)sender {
93 [NSApp endSheet:[self window]]; 94 [NSApp endSheet:[self window]];
94 } 95 }
95 96
96 - (IBAction)ok:(id)sender { 97 - (IBAction)ok:(id)sender {
97 NSString* name = [nameField_ stringValue]; 98 NSString* name = [nameField_ stringValue];
98 BookmarkModel* model = profile_->GetBookmarkModel(); 99 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);
99 if (node_) { 100 if (node_) {
100 model->SetTitle(node_, base::SysNSStringToUTF16(name)); 101 model->SetTitle(node_, base::SysNSStringToUTF16(name));
101 } else { 102 } else {
102 model->AddFolder(parent_, 103 model->AddFolder(parent_,
103 newIndex_, 104 newIndex_,
104 base::SysNSStringToUTF16(name)); 105 base::SysNSStringToUTF16(name));
105 } 106 }
106 [NSApp endSheet:[self window]]; 107 [NSApp endSheet:[self window]];
107 } 108 }
108 109
(...skipping 11 matching lines...) Expand all
120 121
121 - (void)setFolderName:(NSString*)name { 122 - (void)setFolderName:(NSString*)name {
122 [nameField_ setStringValue:name]; 123 [nameField_ setStringValue:name];
123 } 124 }
124 125
125 - (NSButton*)okButton { 126 - (NSButton*)okButton {
126 return okButton_; 127 return okButton_;
127 } 128 }
128 129
129 @end // BookmarkNameFolderController 130 @end // BookmarkNameFolderController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698