Chromium Code Reviews| 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_folder_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" |
| 6 | 6 |
| 7 #include "base/mac/bundle_locations.h" | 7 #include "base/mac/bundle_locations.h" |
| 8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
| 9 #import "chrome/browser/bookmarks/bookmark_model_factory.h" | 9 #import "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 10 #import "chrome/browser/bookmarks/managed_bookmark_service_factory.h" | 10 #import "chrome/browser/bookmarks/managed_bookmark_service_factory.h" |
| (...skipping 1728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1739 y = buttonFrame.origin.y - 0.5 * bookmarks::kBookmarkVerticalPadding; | 1739 y = buttonFrame.origin.y - 0.5 * bookmarks::kBookmarkVerticalPadding; |
| 1740 | 1740 |
| 1741 } | 1741 } |
| 1742 } else { | 1742 } else { |
| 1743 NOTREACHED(); | 1743 NOTREACHED(); |
| 1744 } | 1744 } |
| 1745 | 1745 |
| 1746 return y; | 1746 return y; |
| 1747 } | 1747 } |
| 1748 | 1748 |
| 1749 - (ThemeService*)themeService { | 1749 - (Profile*)profile { |
|
groby-ooo-7-16
2015/12/11 02:32:00
return profile_;
should do the trick.
| |
| 1750 return [parentController_ themeService]; | 1750 return [parentController_ profile]; |
| 1751 } | 1751 } |
| 1752 | 1752 |
| 1753 - (void)childFolderWillShow:(id<BookmarkButtonControllerProtocol>)child { | 1753 - (void)childFolderWillShow:(id<BookmarkButtonControllerProtocol>)child { |
| 1754 // Do nothing. | 1754 // Do nothing. |
| 1755 } | 1755 } |
| 1756 | 1756 |
| 1757 - (void)childFolderWillClose:(id<BookmarkButtonControllerProtocol>)child { | 1757 - (void)childFolderWillClose:(id<BookmarkButtonControllerProtocol>)child { |
| 1758 // Do nothing. | 1758 // Do nothing. |
| 1759 } | 1759 } |
| 1760 | 1760 |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2043 | 2043 |
| 2044 - (void)setIgnoreAnimations:(BOOL)ignore { | 2044 - (void)setIgnoreAnimations:(BOOL)ignore { |
| 2045 ignoreAnimations_ = ignore; | 2045 ignoreAnimations_ = ignore; |
| 2046 } | 2046 } |
| 2047 | 2047 |
| 2048 - (BookmarkButton*)buttonThatMouseIsIn { | 2048 - (BookmarkButton*)buttonThatMouseIsIn { |
| 2049 return buttonThatMouseIsIn_; | 2049 return buttonThatMouseIsIn_; |
| 2050 } | 2050 } |
| 2051 | 2051 |
| 2052 @end // BookmarkBarFolderController | 2052 @end // BookmarkBarFolderController |
| OLD | NEW |