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

Side by Side Diff: chrome/browser/cocoa/bookmark_editor_controller.h

Issue 2769014: Mac/clang: Possibly contentious changes. (Closed)
Patch Set: comments2 Created 10 years, 6 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
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 #ifndef CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_CONTROLLER_H_
6 #define CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_CONTROLLER_H_ 6 #define CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_CONTROLLER_H_
7 7
8 #import "chrome/browser/cocoa/bookmark_editor_base_controller.h" 8 #import "chrome/browser/cocoa/bookmark_editor_base_controller.h"
9 9
10 // A controller for the bookmark editor, opened by 1) Edit... from the 10 // A controller for the bookmark editor, opened by 1) Edit... from the
11 // context menu of a bookmark button, and 2) Bookmark this Page...'s Edit 11 // context menu of a bookmark button, and 2) Bookmark this Page...'s Edit
12 // button. 12 // button.
13 @interface BookmarkEditorController : BookmarkEditorBaseController { 13 @interface BookmarkEditorController : BookmarkEditorBaseController {
14 @private 14 @private
15 const BookmarkNode* node_; // weak; owned by the model 15 const BookmarkNode* node_; // weak; owned by the model
16 scoped_nsobject<NSString> initialUrl_; 16 scoped_nsobject<NSString> initialUrl_;
17 NSString* displayURL_; // Bound to a text field in the dialog. 17 NSString* displayURL_; // Bound to a text field in the dialog.
18 IBOutlet NSTextField* urlField_; 18 IBOutlet NSTextField* urlField_;
19 } 19 }
20 20
21 @property (copy) NSString* displayURL; 21 @property (nonatomic, copy) NSString* displayURL;
22 22
23 - (id)initWithParentWindow:(NSWindow*)parentWindow 23 - (id)initWithParentWindow:(NSWindow*)parentWindow
24 profile:(Profile*)profile 24 profile:(Profile*)profile
25 parent:(const BookmarkNode*)parent 25 parent:(const BookmarkNode*)parent
26 node:(const BookmarkNode*)node 26 node:(const BookmarkNode*)node
27 configuration:(BookmarkEditor::Configuration)configuration; 27 configuration:(BookmarkEditor::Configuration)configuration;
28 28
29 @end 29 @end
30 30
31 @interface BookmarkEditorController (UnitTesting) 31 @interface BookmarkEditorController (UnitTesting)
32 - (NSColor *)urlFieldColor; 32 - (NSColor *)urlFieldColor;
33 @end 33 @end
34 34
35 #endif // CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_CONTROLLER_H_ 35 #endif // CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698