OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "ios/chrome/browser/ui/toolbar/toolbar_controller.h" | 5 #import "ios/chrome/browser/ui/toolbar/toolbar_controller.h" |
6 | 6 |
7 #include <QuartzCore/QuartzCore.h> | 7 #include <QuartzCore/QuartzCore.h> |
8 | 8 |
9 #include "base/format_macros.h" | 9 #include "base/format_macros.h" |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 #import "ios/chrome/browser/ui/toolbar/toolbar_controller_private.h" | 26 #import "ios/chrome/browser/ui/toolbar/toolbar_controller_private.h" |
27 #include "ios/chrome/browser/ui/toolbar/toolbar_resource_macros.h" | 27 #include "ios/chrome/browser/ui/toolbar/toolbar_resource_macros.h" |
28 #import "ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.h" | 28 #import "ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.h" |
29 #import "ios/chrome/browser/ui/toolbar/tools_menu_button_observer_bridge.h" | 29 #import "ios/chrome/browser/ui/toolbar/tools_menu_button_observer_bridge.h" |
30 #import "ios/chrome/browser/ui/tools_menu/tools_popup_controller.h" | 30 #import "ios/chrome/browser/ui/tools_menu/tools_popup_controller.h" |
31 #import "ios/chrome/browser/ui/uikit_ui_util.h" | 31 #import "ios/chrome/browser/ui/uikit_ui_util.h" |
32 #import "ios/chrome/common/material_timing.h" | 32 #import "ios/chrome/common/material_timing.h" |
33 #include "ios/chrome/grit/ios_strings.h" | 33 #include "ios/chrome/grit/ios_strings.h" |
34 #include "ios/chrome/grit/ios_theme_resources.h" | 34 #include "ios/chrome/grit/ios_theme_resources.h" |
35 #import "ios/shared/chrome/browser/ui/tools_menu/tools_menu_configuration.h" | 35 #import "ios/shared/chrome/browser/ui/tools_menu/tools_menu_configuration.h" |
36 #import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoF
ontLoader.h" | 36 #import "ios/third_party/material_components_ios/src/components/Typography/src/M
aterialTypography.h" |
37 | 37 |
38 #if !defined(__has_feature) || !__has_feature(objc_arc) | 38 #if !defined(__has_feature) || !__has_feature(objc_arc) |
39 #error "This file requires ARC support." | 39 #error "This file requires ARC support." |
40 #endif | 40 #endif |
41 | 41 |
42 using base::UserMetricsAction; | 42 using base::UserMetricsAction; |
43 using ios::material::TimingFunction; | 43 using ios::material::TimingFunction; |
44 | 44 |
45 // Animation key used for stack view transition animations | 45 // Animation key used for stack view transition animations |
46 NSString* const kToolbarTransitionAnimationKey = @"ToolbarTransitionAnimation"; | 46 NSString* const kToolbarTransitionAnimationKey = @"ToolbarTransitionAnimation"; |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 } | 396 } |
397 return self; | 397 return self; |
398 } | 398 } |
399 | 399 |
400 - (instancetype)init { | 400 - (instancetype)init { |
401 NOTREACHED(); | 401 NOTREACHED(); |
402 return nil; | 402 return nil; |
403 } | 403 } |
404 | 404 |
405 - (UIFont*)fontForSize:(NSInteger)size { | 405 - (UIFont*)fontForSize:(NSInteger)size { |
406 return [[MDFRobotoFontLoader sharedInstance] boldFontOfSize:size]; | 406 return [[MDCTypography fontLoader] boldFontOfSize:size]; |
407 } | 407 } |
408 | 408 |
409 - (void)dealloc { | 409 - (void)dealloc { |
410 [[NSNotificationCenter defaultCenter] removeObserver:self]; | 410 [[NSNotificationCenter defaultCenter] removeObserver:self]; |
411 [toolsPopupController_ setDelegate:nil]; | 411 [toolsPopupController_ setDelegate:nil]; |
412 } | 412 } |
413 | 413 |
414 - (CGFloat)statusBarOffset { | 414 - (CGFloat)statusBarOffset { |
415 return StatusBarHeight(); | 415 return StatusBarHeight(); |
416 } | 416 } |
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1033 #pragma mark - | 1033 #pragma mark - |
1034 #pragma mark PopupMenuDelegate methods. | 1034 #pragma mark PopupMenuDelegate methods. |
1035 | 1035 |
1036 - (void)dismissPopupMenu:(PopupMenuController*)controller { | 1036 - (void)dismissPopupMenu:(PopupMenuController*)controller { |
1037 if ([controller isKindOfClass:[ToolsPopupController class]] && | 1037 if ([controller isKindOfClass:[ToolsPopupController class]] && |
1038 (ToolsPopupController*)controller == toolsPopupController_) | 1038 (ToolsPopupController*)controller == toolsPopupController_) |
1039 [self dismissToolsMenuPopup]; | 1039 [self dismissToolsMenuPopup]; |
1040 } | 1040 } |
1041 | 1041 |
1042 @end | 1042 @end |
OLD | NEW |