Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm

Issue 2785213003: [ios] Use dispatcher for ToolsMenu commands. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 1f9721bbc7e26c4555ee966ed6b439e6833e8ce3..779c7e1301679742ac6992549b509f493d397c2c 100644
--- a/ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm
+++ b/ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm
@@ -7,9 +7,8 @@
#import "base/mac/foundation_util.h"
#import "ios/clean/chrome/browser/ui/actions/tab_grid_actions.h"
#import "ios/clean/chrome/browser/ui/actions/tab_strip_actions.h"
-#import "ios/clean/chrome/browser/ui/actions/tools_menu_actions.h"
#import "ios/clean/chrome/browser/ui/commands/navigation_commands.h"
-#import "ios/clean/chrome/browser/ui/commands/toolbar_commands.h"
+#import "ios/clean/chrome/browser/ui/commands/tools_menu_commands.h"
#import "ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.h"
#import "ios/clean/chrome/browser/ui/toolbar/toolbar_component_options.h"
@@ -24,7 +23,7 @@ CGFloat kVerticalMargin = 5.0f;
CGFloat kHorizontalMargin = 8.0f;
} // namespace
-@interface ToolbarViewController ()<ToolsMenuActions>
+@interface ToolbarViewController ()
@property(nonatomic, strong) UITextField* omnibox;
@property(nonatomic, strong) UIStackView* stackView;
@property(nonatomic, strong) ToolbarButton* backButton;
@@ -139,14 +138,14 @@ CGFloat kHorizontalMargin = 8.0f;
self.toolsMenuButton = [ToolbarButton toolsMenuToolbarButton];
self.toolsMenuButton.visibilityMask = ToolbarComponentVisibilityCompactWidth |
ToolbarComponentVisibilityRegularWidth;
- [self.toolsMenuButton addTarget:nil
+ [self.toolsMenuButton addTarget:self
action:@selector(showToolsMenu:)
forControlEvents:UIControlEventTouchUpInside];
// Share button.
self.shareButton = [ToolbarButton shareToolbarButton];
self.shareButton.visibilityMask = ToolbarComponentVisibilityRegularWidth;
- [self.shareButton addTarget:nil
+ [self.shareButton addTarget:self
action:@selector(showShareMenu:)
forControlEvents:UIControlEventTouchUpInside];
@@ -207,7 +206,7 @@ CGFloat kHorizontalMargin = 8.0f;
fromView:self.toolsMenuButton];
}
-#pragma mark - ToolsMenuActions
+#pragma mark - ToolsMenuCommands
edchin 2017/03/31 02:44:57 These methods can just be marked as Private method
sczs 2017/03/31 17:32:57 I like the idea, thanks! Done.
- (void)showToolsMenu:(id)sender {
[self.dispatcher showToolsMenu];
@@ -217,7 +216,11 @@ CGFloat kHorizontalMargin = 8.0f;
[self.dispatcher closeToolsMenu];
}
-#pragma mark - NavigationActions
+- (void)showShareMenu:(id)sender {
+ [self.dispatcher showShareMenu];
+}
+
+#pragma mark - NavigationCommands
- (void)goBack:(id)sender {
[self.dispatcher goBack];
@@ -251,10 +254,6 @@ CGFloat kHorizontalMargin = 8.0f;
#pragma mark - Helper Methods
-// PLACEHOLDER: We are not sure yet how WebState changes will affect Toolbar
-// Buttons, but the VC will eventually set the flag on the ToolbarButton
-// indicating it could or not it should be hidden. Once this is done we will
-// update all the ToolbarButtons visibility.
// Updates all Buttons visibility to match any recent WebState change.
- (void)updateAllButtonsVisibility {
for (UIView* view in self.stackView.arrangedSubviews) {

Powered by Google App Engine
This is Rietveld 408576698