Chromium Code Reviews| Index: ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm |
| diff --git a/ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm b/ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm |
| index b8b60ca57f33f78eadfb217ffa245305362647d4..58885321e92f60551baeda087447c4bbf68c02d8 100644 |
| --- a/ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm |
| +++ b/ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm |
| @@ -5,6 +5,7 @@ |
| #import "ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.h" |
| #import "base/mac/foundation_util.h" |
| +#import "ios/chrome/browser/ui/uikit_ui_util.h" |
| #import "ios/clean/chrome/browser/ui/actions/tab_strip_actions.h" |
| #import "ios/clean/chrome/browser/ui/commands/navigation_commands.h" |
| #import "ios/clean/chrome/browser/ui/commands/tab_grid_commands.h" |
| @@ -162,6 +163,13 @@ |
| [self.tabSwitchStripButton addTarget:nil |
| action:@selector(showTabStrip:) |
| forControlEvents:UIControlEventTouchUpInside]; |
| + [self.tabSwitchStripButton |
| + setTitleColor:[UIColor colorWithWhite:kToolbarButtonTitleNormalColor |
| + alpha:1.0] |
| + forState:UIControlStateNormal]; |
| + [self.tabSwitchStripButton |
| + setTitleColor:UIColorFromRGB(kToolbarButtonTitleHighlightedColor, 1.0) |
|
marq (ping after 24h)
2017/05/29 11:04:37
I think you can omit the alpha (1.0) parameter if
sczs
2017/05/30 00:18:21
Done.
|
| + forState:UIControlStateHighlighted]; |
| // Tab switcher Grid button. |
| self.tabSwitchGridButton = [ToolbarButton tabSwitcherGridToolbarButton]; |
| @@ -323,6 +331,12 @@ |
| [self.progressBar setProgress:progress animated:YES completion:nil]; |
| } |
| +- (void)setNumberOfTabs:(int)numberOfTabs { |
| + [self.tabSwitchStripButton |
| + setTitle:[NSString stringWithFormat:@"%d", numberOfTabs] |
|
marq (ping after 24h)
2017/05/29 11:04:37
Duplicate or refactor the logic from [ToolbarContr
sczs
2017/05/30 00:18:21
Done.
|
| + forState:UIControlStateNormal]; |
| +} |
| + |
| #pragma mark - ZoomTransitionDelegate |
| - (CGRect)rectForZoomWithKey:(NSObject*)key inView:(UIView*)view { |