| OLD | NEW |
| 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/bookmark_node_applescript.h" | 5 #import "chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #import "base/mac/foundation_util.h" |
| 8 #import "base/mac/scoped_nsobject.h" | 9 #import "base/mac/scoped_nsobject.h" |
| 9 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
| 10 #import "chrome/browser/app_controller_mac.h" | 11 #import "chrome/browser/app_controller_mac.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 12 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 12 #import "chrome/browser/chrome_browser_application_mac.h" | 13 #import "chrome/browser/chrome_browser_application_mac.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 14 #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" | 15 #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" |
| 15 #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" | 16 #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" |
| 16 #include "components/bookmarks/browser/bookmark_model.h" | 17 #include "components/bookmarks/browser/bookmark_model.h" |
| 17 | 18 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 } | 108 } |
| 108 | 109 |
| 109 - (NSNumber*)index { | 110 - (NSNumber*)index { |
| 110 const BookmarkNode* parent = bookmarkNode_->parent(); | 111 const BookmarkNode* parent = bookmarkNode_->parent(); |
| 111 int index = parent->GetIndexOf(bookmarkNode_); | 112 int index = parent->GetIndexOf(bookmarkNode_); |
| 112 // NOTE: AppleScript is 1-Based. | 113 // NOTE: AppleScript is 1-Based. |
| 113 return [NSNumber numberWithInt:index+1]; | 114 return [NSNumber numberWithInt:index+1]; |
| 114 } | 115 } |
| 115 | 116 |
| 116 - (BookmarkModel*)bookmarkModel { | 117 - (BookmarkModel*)bookmarkModel { |
| 117 AppController* appDelegate = [NSApp delegate]; | 118 AppController* appDelegate = |
| 119 base::mac::ObjCCastStrict<AppController>([NSApp delegate]); |
| 118 | 120 |
| 119 Profile* lastProfile = [appDelegate lastProfile]; | 121 Profile* lastProfile = [appDelegate lastProfile]; |
| 120 if (!lastProfile) { | 122 if (!lastProfile) { |
| 121 AppleScript::SetError(AppleScript::errGetProfile); | 123 AppleScript::SetError(AppleScript::errGetProfile); |
| 122 return NULL; | 124 return NULL; |
| 123 } | 125 } |
| 124 | 126 |
| 125 BookmarkModel* model = BookmarkModelFactory::GetForProfile(lastProfile); | 127 BookmarkModel* model = BookmarkModelFactory::GetForProfile(lastProfile); |
| 126 if (!model->loaded()) { | 128 if (!model->loaded()) { |
| 127 AppleScript::SetError(AppleScript::errBookmarkModelLoad); | 129 AppleScript::SetError(AppleScript::errBookmarkModelLoad); |
| 128 return NULL; | 130 return NULL; |
| 129 } | 131 } |
| 130 | 132 |
| 131 return model; | 133 return model; |
| 132 } | 134 } |
| 133 | 135 |
| 134 @end | 136 @end |
| OLD | NEW |