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

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

Issue 10825447: chrome/browser should build on the x86_64 architecture (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
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
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/bookmarks/bookmark_bar_controller.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
6 6
7 #include "base/mac/bundle_locations.h" 7 #include "base/mac/bundle_locations.h"
8 #include "base/mac/mac_util.h" 8 #include "base/mac/mac_util.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 225
226 @end 226 @end
227 227
228 @implementation BookmarkBarController 228 @implementation BookmarkBarController
229 229
230 @synthesize visualState = visualState_; 230 @synthesize visualState = visualState_;
231 @synthesize lastVisualState = lastVisualState_; 231 @synthesize lastVisualState = lastVisualState_;
232 @synthesize delegate = delegate_; 232 @synthesize delegate = delegate_;
233 233
234 - (id)initWithBrowser:(Browser*)browser 234 - (id)initWithBrowser:(Browser*)browser
235 initialWidth:(float)initialWidth 235 initialWidth:(CGFloat)initialWidth
236 delegate:(id<BookmarkBarControllerDelegate>)delegate 236 delegate:(id<BookmarkBarControllerDelegate>)delegate
237 resizeDelegate:(id<ViewResizer>)resizeDelegate { 237 resizeDelegate:(id<ViewResizer>)resizeDelegate {
238 if ((self = [super initWithNibName:@"BookmarkBar" 238 if ((self = [super initWithNibName:@"BookmarkBar"
239 bundle:base::mac::FrameworkBundle()])) { 239 bundle:base::mac::FrameworkBundle()])) {
240 // Initialize to an invalid state. 240 // Initialize to an invalid state.
241 visualState_ = bookmarks::kInvalidState; 241 visualState_ = bookmarks::kInvalidState;
242 lastVisualState_ = bookmarks::kInvalidState; 242 lastVisualState_ = bookmarks::kInvalidState;
243 243
244 browser_ = browser; 244 browser_ = browser;
245 initialWidth_ = initialWidth; 245 initialWidth_ = initialWidth;
(...skipping 2547 matching lines...) Expand 10 before | Expand all | Expand 10 after
2793 // to minimize touching the object passed in (likely a mock). 2793 // to minimize touching the object passed in (likely a mock).
2794 - (void)setButtonContextMenu:(id)menu { 2794 - (void)setButtonContextMenu:(id)menu {
2795 buttonContextMenu_ = menu; 2795 buttonContextMenu_ = menu;
2796 } 2796 }
2797 2797
2798 - (void)setIgnoreAnimations:(BOOL)ignore { 2798 - (void)setIgnoreAnimations:(BOOL)ignore {
2799 ignoreAnimations_ = ignore; 2799 ignoreAnimations_ = ignore;
2800 } 2800 }
2801 2801
2802 @end 2802 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698