| 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/bookmarks/bookmark_bar_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #import "base/mac/bundle_locations.h" | 9 #import "base/mac/bundle_locations.h" |
| 10 #import "base/mac/foundation_util.h" | 10 #import "base/mac/foundation_util.h" |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 if (!ui::MaterialDesignController::IsModeMaterial()) { | 262 if (!ui::MaterialDesignController::IsModeMaterial()) { |
| 263 return 2.0; | 263 return 2.0; |
| 264 } | 264 } |
| 265 return 4.0; | 265 return 4.0; |
| 266 } | 266 } |
| 267 | 267 |
| 268 CGFloat BookmarkLeftMargin() { | 268 CGFloat BookmarkLeftMargin() { |
| 269 if (!ui::MaterialDesignController::IsModeMaterial()) { | 269 if (!ui::MaterialDesignController::IsModeMaterial()) { |
| 270 return 2.0; | 270 return 2.0; |
| 271 } | 271 } |
| 272 return 12.0; | 272 return 8.0; |
| 273 } | 273 } |
| 274 | 274 |
| 275 CGFloat BookmarkRightMargin() { | 275 CGFloat BookmarkRightMargin() { |
| 276 if (!ui::MaterialDesignController::IsModeMaterial()) { | 276 if (!ui::MaterialDesignController::IsModeMaterial()) { |
| 277 return 2.0; | 277 return 2.0; |
| 278 } | 278 } |
| 279 return 12.0; | 279 return 8.0; |
| 280 } | 280 } |
| 281 | 281 |
| 282 } // namespace bookmarks | 282 } // namespace bookmarks |
| 283 | 283 |
| 284 @implementation BookmarkBarController | 284 @implementation BookmarkBarController |
| 285 | 285 |
| 286 @synthesize currentState = currentState_; | 286 @synthesize currentState = currentState_; |
| 287 @synthesize lastState = lastState_; | 287 @synthesize lastState = lastState_; |
| 288 @synthesize isAnimationRunning = isAnimationRunning_; | 288 @synthesize isAnimationRunning = isAnimationRunning_; |
| 289 @synthesize delegate = delegate_; | 289 @synthesize delegate = delegate_; |
| (...skipping 2795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3085 - (id<BookmarkButtonControllerProtocol>)controllerForNode: | 3085 - (id<BookmarkButtonControllerProtocol>)controllerForNode: |
| 3086 (const BookmarkNode*)node { | 3086 (const BookmarkNode*)node { |
| 3087 // See if it's in the bar, then if it is in the hierarchy of visible | 3087 // See if it's in the bar, then if it is in the hierarchy of visible |
| 3088 // folder menus. | 3088 // folder menus. |
| 3089 if (bookmarkModel_->bookmark_bar_node() == node) | 3089 if (bookmarkModel_->bookmark_bar_node() == node) |
| 3090 return self; | 3090 return self; |
| 3091 return [folderController_ controllerForNode:node]; | 3091 return [folderController_ controllerForNode:node]; |
| 3092 } | 3092 } |
| 3093 | 3093 |
| 3094 @end | 3094 @end |
| OLD | NEW |