| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 | 53 |
| 54 // The initial capacity used to construct |self.transitionLayers|. The value | 54 // The initial capacity used to construct |self.transitionLayers|. The value |
| 55 // is chosen because WebToolbarController animates 11 separate layers during | 55 // is chosen because WebToolbarController animates 11 separate layers during |
| 56 // transitions; this value should be updated if new subviews are animated in | 56 // transitions; this value should be updated if new subviews are animated in |
| 57 // the future. | 57 // the future. |
| 58 const NSUInteger kTransitionLayerCapacity = 11; | 58 const NSUInteger kTransitionLayerCapacity = 11; |
| 59 | 59 |
| 60 // Externed delay before non-initial button images are loaded. | 60 // Externed delay before non-initial button images are loaded. |
| 61 const int64_t kNonInitialImageAdditionDelayNanosec = 500000LL; | 61 const int64_t kNonInitialImageAdditionDelayNanosec = 500000LL; |
| 62 NSString* const kMenuWillShowNotification = @"kMenuWillShowNotification"; | 62 NSString* const kMenuWillShowNotification = @"kMenuWillShowNotification"; |
| 63 NSString* const kMenuDidShowNotification = @"kMenuDidShowNotification"; |
| 63 NSString* const kMenuWillHideNotification = @"kMenuWillHideNotification"; | 64 NSString* const kMenuWillHideNotification = @"kMenuWillHideNotification"; |
| 64 | 65 |
| 65 NSString* const kToolbarIdentifier = @"kToolbarIdentifier"; | 66 NSString* const kToolbarIdentifier = @"kToolbarIdentifier"; |
| 66 NSString* const kIncognitoToolbarIdentifier = @"kIncognitoToolbarIdentifier"; | 67 NSString* const kIncognitoToolbarIdentifier = @"kIncognitoToolbarIdentifier"; |
| 67 NSString* const kToolbarToolsMenuButtonIdentifier = | 68 NSString* const kToolbarToolsMenuButtonIdentifier = |
| 68 @"kToolbarToolsMenuButtonIdentifier"; | 69 @"kToolbarToolsMenuButtonIdentifier"; |
| 69 NSString* const kToolbarStackButtonIdentifier = | 70 NSString* const kToolbarStackButtonIdentifier = |
| 70 @"kToolbarStackButtonIdentifier"; | 71 @"kToolbarStackButtonIdentifier"; |
| 71 NSString* const kToolbarShareButtonIdentifier = | 72 NSString* const kToolbarShareButtonIdentifier = |
| 72 @"kToolbarShareButtonIdentifier"; | 73 @"kToolbarShareButtonIdentifier"; |
| (...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1033 #pragma mark - | 1034 #pragma mark - |
| 1034 #pragma mark PopupMenuDelegate methods. | 1035 #pragma mark PopupMenuDelegate methods. |
| 1035 | 1036 |
| 1036 - (void)dismissPopupMenu:(PopupMenuController*)controller { | 1037 - (void)dismissPopupMenu:(PopupMenuController*)controller { |
| 1037 if ([controller isKindOfClass:[ToolsPopupController class]] && | 1038 if ([controller isKindOfClass:[ToolsPopupController class]] && |
| 1038 (ToolsPopupController*)controller == toolsPopupController_) | 1039 (ToolsPopupController*)controller == toolsPopupController_) |
| 1039 [self dismissToolsMenuPopup]; | 1040 [self dismissToolsMenuPopup]; |
| 1040 } | 1041 } |
| 1041 | 1042 |
| 1042 @end | 1043 @end |
| OLD | NEW |