| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_editor_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" |
| 6 | 6 |
| 7 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" |
| 8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 10 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
| 11 #import "chrome/browser/ui/cocoa/dialog_text_field_editor.h" |
| 11 #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" | 12 #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" |
| 12 #include "components/bookmarks/browser/bookmark_model.h" | 13 #include "components/bookmarks/browser/bookmark_model.h" |
| 13 #include "components/url_formatter/url_fixer.h" | 14 #include "components/url_formatter/url_fixer.h" |
| 14 #include "components/user_prefs/user_prefs.h" | 15 #include "components/user_prefs/user_prefs.h" |
| 15 | 16 |
| 16 using bookmarks::BookmarkExpandedStateTracker; | 17 using bookmarks::BookmarkExpandedStateTracker; |
| 17 using bookmarks::BookmarkModel; | 18 using bookmarks::BookmarkModel; |
| 18 using bookmarks::BookmarkNode; | 19 using bookmarks::BookmarkNode; |
| 19 | 20 |
| 20 @interface BookmarkEditorController (Private) | 21 @interface BookmarkEditorController (Private) |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 if (url.is_valid()) | 75 if (url.is_valid()) |
| 75 initialUrl_.reset([[NSString stringWithUTF8String:url.spec().c_str()] | 76 initialUrl_.reset([[NSString stringWithUTF8String:url.spec().c_str()] |
| 76 retain]); | 77 retain]); |
| 77 } | 78 } |
| 78 [self setDisplayURL:initialUrl_]; | 79 [self setDisplayURL:initialUrl_]; |
| 79 [super awakeFromNib]; | 80 [super awakeFromNib]; |
| 80 [self expandNodes: | 81 [self expandNodes: |
| 81 [self bookmarkModel]->expanded_state_tracker()->GetExpandedNodes()]; | 82 [self bookmarkModel]->expanded_state_tracker()->GetExpandedNodes()]; |
| 82 } | 83 } |
| 83 | 84 |
| 85 - (id)windowWillReturnFieldEditor:(NSWindow*)sender toObject:(id)obj { |
| 86 if (obj == urlField_) { |
| 87 if (!urlFieldEditor_) |
| 88 urlFieldEditor_.reset([[DialogTextFieldEditor alloc] init]); |
| 89 |
| 90 return urlFieldEditor_.autorelease(); |
| 91 } else if (obj == nameTextField_) { |
| 92 if (!nameFieldEditor_) |
| 93 nameFieldEditor_.reset([[DialogTextFieldEditor alloc] init]); |
| 94 |
| 95 return nameFieldEditor_.autorelease(); |
| 96 } |
| 97 |
| 98 return nil; |
| 99 } |
| 100 |
| 84 - (void)nodeRemoved:(const BookmarkNode*)node | 101 - (void)nodeRemoved:(const BookmarkNode*)node |
| 85 fromParent:(const BookmarkNode*)parent | 102 fromParent:(const BookmarkNode*)parent |
| 86 { | 103 { |
| 87 // Be conservative; it is needed (e.g. "Add Page...") | 104 // Be conservative; it is needed (e.g. "Add Page...") |
| 88 node_ = NULL; | 105 node_ = NULL; |
| 89 [self cancel:self]; | 106 [self cancel:self]; |
| 90 } | 107 } |
| 91 | 108 |
| 92 #pragma mark Bookmark Editing | 109 #pragma mark Bookmark Editing |
| 93 | 110 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 SetExpandedNodes(expanded_nodes); | 172 SetExpandedNodes(expanded_nodes); |
| 156 return [NSNumber numberWithBool:YES]; | 173 return [NSNumber numberWithBool:YES]; |
| 157 } | 174 } |
| 158 | 175 |
| 159 - (NSColor *)urlFieldColor { | 176 - (NSColor *)urlFieldColor { |
| 160 return [urlField_ backgroundColor]; | 177 return [urlField_ backgroundColor]; |
| 161 } | 178 } |
| 162 | 179 |
| 163 @end // BookmarkEditorController | 180 @end // BookmarkEditorController |
| 164 | 181 |
| OLD | NEW |