| 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 "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 2270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2281 if ([self isAnimatingFromState:bookmarks::kDetachedState]) { | 2281 if ([self isAnimatingFromState:bookmarks::kDetachedState]) { |
| 2282 return static_cast<CGFloat>( | 2282 return static_cast<CGFloat>( |
| 2283 1 - [[self animatableView] currentAnimationProgress]); | 2283 1 - [[self animatableView] currentAnimationProgress]); |
| 2284 } | 2284 } |
| 2285 return 0; | 2285 return 0; |
| 2286 } | 2286 } |
| 2287 | 2287 |
| 2288 #pragma mark BookmarkBarToolbarViewController Protocol | 2288 #pragma mark BookmarkBarToolbarViewController Protocol |
| 2289 | 2289 |
| 2290 - (int)currentTabContentsHeight { | 2290 - (int)currentTabContentsHeight { |
| 2291 WebContents* wc = browser_->GetSelectedWebContents(); | 2291 WebContents* wc = browser_->GetActiveWebContents(); |
| 2292 return wc ? wc->GetView()->GetContainerSize().height() : 0; | 2292 return wc ? wc->GetView()->GetContainerSize().height() : 0; |
| 2293 } | 2293 } |
| 2294 | 2294 |
| 2295 - (ui::ThemeProvider*)themeProvider { | 2295 - (ui::ThemeProvider*)themeProvider { |
| 2296 return ThemeServiceFactory::GetForProfile(browser_->profile()); | 2296 return ThemeServiceFactory::GetForProfile(browser_->profile()); |
| 2297 } | 2297 } |
| 2298 | 2298 |
| 2299 #pragma mark BookmarkButtonDelegate Protocol | 2299 #pragma mark BookmarkButtonDelegate Protocol |
| 2300 | 2300 |
| 2301 - (void)fillPasteboard:(NSPasteboard*)pboard | 2301 - (void)fillPasteboard:(NSPasteboard*)pboard |
| (...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2787 // to minimize touching the object passed in (likely a mock). | 2787 // to minimize touching the object passed in (likely a mock). |
| 2788 - (void)setButtonContextMenu:(id)menu { | 2788 - (void)setButtonContextMenu:(id)menu { |
| 2789 buttonContextMenu_ = menu; | 2789 buttonContextMenu_ = menu; |
| 2790 } | 2790 } |
| 2791 | 2791 |
| 2792 - (void)setIgnoreAnimations:(BOOL)ignore { | 2792 - (void)setIgnoreAnimations:(BOOL)ignore { |
| 2793 ignoreAnimations_ = ignore; | 2793 ignoreAnimations_ = ignore; |
| 2794 } | 2794 } |
| 2795 | 2795 |
| 2796 @end | 2796 @end |
| OLD | NEW |