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

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

Issue 12538012: Mac: "Import bookmarks..." right click shouldn't bring up context menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h ('k') | no next file » | 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) 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_bar_view.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h"
6 6
7 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" 7 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #import "chrome/browser/themes/theme_properties.h" 9 #import "chrome/browser/themes/theme_properties.h"
10 #import "chrome/browser/themes/theme_service.h" 10 #import "chrome/browser/themes/theme_service.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 true); 91 true);
92 [noItemTextfield_ setTextColor:color]; 92 [noItemTextfield_ setTextColor:color];
93 } 93 }
94 94
95 // Mouse down events on the bookmark bar should not allow dragging the parent 95 // Mouse down events on the bookmark bar should not allow dragging the parent
96 // window around. 96 // window around.
97 - (BOOL)mouseDownCanMoveWindow { 97 - (BOOL)mouseDownCanMoveWindow {
98 return NO; 98 return NO;
99 } 99 }
100 100
101 -(BookmarkBarTextField*)noItemTextfield { 101 - (BookmarkBarTextField*)noItemTextfield {
102 return noItemTextfield_; 102 return noItemTextfield_;
103 } 103 }
104 104
105 -(BookmarkBarImportButton*)importBookmarksButton { 105 - (NSButton*)importBookmarksButton {
106 return importBookmarksButton_; 106 return importBookmarksButton_;
107 } 107 }
108 108
109 - (BookmarkBarController*)controller { 109 - (BookmarkBarController*)controller {
110 return controller_; 110 return controller_;
111 } 111 }
112 112
113 // Internal method, needs to be called whenever a change has been made to 113 // Internal method, needs to be called whenever a change has been made to
114 // dropIndicatorShown_ or dropIndicatorPosition_ so it can get the controller 114 // dropIndicatorShown_ or dropIndicatorPosition_ so it can get the controller
115 // to reflect the change by moving buttons around. 115 // to reflect the change by moving buttons around.
116 -(void)dropIndicatorChanged { 116 - (void)dropIndicatorChanged {
117 if (dropIndicatorShown_) 117 if (dropIndicatorShown_)
118 [controller_ setDropInsertionPos:dropIndicatorPosition_]; 118 [controller_ setDropInsertionPos:dropIndicatorPosition_];
119 else 119 else
120 [controller_ clearDropInsertionPos]; 120 [controller_ clearDropInsertionPos];
121 } 121 }
122 122
123 -(void)drawRect:(NSRect)dirtyRect { 123 - (void)drawRect:(NSRect)dirtyRect {
124 [super drawRect:dirtyRect]; 124 [super drawRect:dirtyRect];
125 } 125 }
126 126
127 // Shim function to assist in unit testing. 127 // Shim function to assist in unit testing.
128 - (BOOL)dragClipboardContainsBookmarks { 128 - (BOOL)dragClipboardContainsBookmarks {
129 return bookmark_pasteboard_helper_mac::PasteboardContainsBookmarks( 129 return bookmark_pasteboard_helper_mac::PasteboardContainsBookmarks(
130 bookmark_pasteboard_helper_mac::kDragPasteboard); 130 bookmark_pasteboard_helper_mac::kDragPasteboard);
131 } 131 }
132 132
133 // NSDraggingDestination methods 133 // NSDraggingDestination methods
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 @end // @implementation BookmarkBarView 280 @end // @implementation BookmarkBarView
281 281
282 @implementation BookmarkBarTextField 282 @implementation BookmarkBarTextField
283 283
284 - (NSMenu*)menu { 284 - (NSMenu*)menu {
285 return [barView_ menu]; 285 return [barView_ menu];
286 } 286 }
287 287
288 @end // @implementation BookmarkBarTextField 288 @end // @implementation BookmarkBarTextField
289 289
290 @implementation BookmarkBarImportButton
291
292 - (NSMenu*)menu {
293 return [barView_ menu];
294 }
295
296 @end // @implementation BookmarkBarImportButton
297
298 @implementation BookmarkBarItemContainer 290 @implementation BookmarkBarItemContainer
299 291
300 - (NSMenu*)menu { 292 - (NSMenu*)menu {
301 return [barView_ menu]; 293 return [barView_ menu];
302 } 294 }
303 295
304 @end // @implementation BookmarkBarItemContainer 296 @end // @implementation BookmarkBarItemContainer
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698