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

Side by Side Diff: chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/applescript/browsercrapplication+applescript.h" 5 #import "chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #import "base/memory/scoped_nsobject.h" 8 #import "base/memory/scoped_nsobject.h"
9 #import "chrome/browser/app_controller_mac.h" 9 #import "chrome/browser/app_controller_mac.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
11 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_list.h" 14 #include "chrome/browser/ui/browser_list.h"
14 #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" 15 #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h"
15 #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" 16 #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h"
16 #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" 17 #import "chrome/browser/ui/cocoa/applescript/error_applescript.h"
17 #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" 18 #import "chrome/browser/ui/cocoa/applescript/window_applescript.h"
18 19
19 @implementation BrowserCrApplication (AppleScriptAdditions) 20 @implementation BrowserCrApplication (AppleScriptAdditions)
20 21
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 70
70 - (BookmarkFolderAppleScript*)otherBookmarks { 71 - (BookmarkFolderAppleScript*)otherBookmarks {
71 AppController* appDelegate = [NSApp delegate]; 72 AppController* appDelegate = [NSApp delegate];
72 73
73 Profile* lastProfile = [appDelegate lastProfile]; 74 Profile* lastProfile = [appDelegate lastProfile];
74 if (!lastProfile) { 75 if (!lastProfile) {
75 AppleScript::SetError(AppleScript::errGetProfile); 76 AppleScript::SetError(AppleScript::errGetProfile);
76 return nil; 77 return nil;
77 } 78 }
78 79
79 BookmarkModel* model = lastProfile->GetBookmarkModel(); 80 BookmarkModel* model = BookmarkModelFactory::GetForProfile(lastProfile);
80 if (!model->IsLoaded()) { 81 if (!model->IsLoaded()) {
81 AppleScript::SetError(AppleScript::errBookmarkModelLoad); 82 AppleScript::SetError(AppleScript::errBookmarkModelLoad);
82 return nil; 83 return nil;
83 } 84 }
84 85
85 BookmarkFolderAppleScript* otherBookmarks = 86 BookmarkFolderAppleScript* otherBookmarks =
86 [[[BookmarkFolderAppleScript alloc] 87 [[[BookmarkFolderAppleScript alloc]
87 initWithBookmarkNode:model->other_node()] autorelease]; 88 initWithBookmarkNode:model->other_node()] autorelease];
88 [otherBookmarks setContainer:self 89 [otherBookmarks setContainer:self
89 property:AppleScript::kBookmarkFoldersProperty]; 90 property:AppleScript::kBookmarkFoldersProperty];
90 return otherBookmarks; 91 return otherBookmarks;
91 } 92 }
92 93
93 - (BookmarkFolderAppleScript*)bookmarksBar { 94 - (BookmarkFolderAppleScript*)bookmarksBar {
94 AppController* appDelegate = [NSApp delegate]; 95 AppController* appDelegate = [NSApp delegate];
95 96
96 Profile* lastProfile = [appDelegate lastProfile]; 97 Profile* lastProfile = [appDelegate lastProfile];
97 if (!lastProfile) { 98 if (!lastProfile) {
98 AppleScript::SetError(AppleScript::errGetProfile); 99 AppleScript::SetError(AppleScript::errGetProfile);
99 return nil; 100 return nil;
100 } 101 }
101 102
102 BookmarkModel* model = lastProfile->GetBookmarkModel(); 103 BookmarkModel* model = BookmarkModelFactory::GetForProfile(lastProfile);
103 if (!model->IsLoaded()) { 104 if (!model->IsLoaded()) {
104 AppleScript::SetError(AppleScript::errBookmarkModelLoad); 105 AppleScript::SetError(AppleScript::errBookmarkModelLoad);
105 return NULL; 106 return NULL;
106 } 107 }
107 108
108 BookmarkFolderAppleScript* bookmarksBar = 109 BookmarkFolderAppleScript* bookmarksBar =
109 [[[BookmarkFolderAppleScript alloc] 110 [[[BookmarkFolderAppleScript alloc]
110 initWithBookmarkNode:model->bookmark_bar_node()] autorelease]; 111 initWithBookmarkNode:model->bookmark_bar_node()] autorelease];
111 [bookmarksBar setContainer:self 112 [bookmarksBar setContainer:self
112 property:AppleScript::kBookmarkFoldersProperty]; 113 property:AppleScript::kBookmarkFoldersProperty];
(...skipping 15 matching lines...) Expand all
128 129
129 - (void)insertInBookmarksFolders:(id)aBookmarkFolder atIndex:(int)index { 130 - (void)insertInBookmarksFolders:(id)aBookmarkFolder atIndex:(int)index {
130 NOTIMPLEMENTED(); 131 NOTIMPLEMENTED();
131 } 132 }
132 133
133 - (void)removeFromBookmarksFoldersAtIndex:(int)index { 134 - (void)removeFromBookmarksFoldersAtIndex:(int)index {
134 NOTIMPLEMENTED(); 135 NOTIMPLEMENTED();
135 } 136 }
136 137
137 @end 138 @end
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698