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

Unified Diff: ios/chrome/browser/ui/browser_view_controller.mm

Issue 2969103002: [ios] Remove IDC_SHOW_TOOLS_MENU
Patch Set: Created 3 years, 5 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
« no previous file with comments | « ios/chrome/app/main_controller.mm ('k') | ios/chrome/browser/ui/commands/browser_commands.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/browser_view_controller.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index 4fd3d63b88e450d63134275319b6b13a020c7855..5ffa4765da77a9601440cc0ac4e977d31a22dab8 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -637,9 +637,6 @@ NSString* const kNativeControllerTemporaryKey = @"NativeControllerTemporaryKey";
- (void)displayTab:(Tab*)tab isNewSelection:(BOOL)newSelection;
// Initializes the bookmark interaction controller if not already initialized.
- (void)initializeBookmarkInteractionController;
-
-// Shows the tools menu popup.
-- (void)showToolsMenuPopup;
// Add all delegates to the provided |tab|.
- (void)installDelegatesForTab:(Tab*)tab;
// Remove delegates from the provided |tab|.
@@ -3437,56 +3434,6 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
#pragma mark - Showing popups
-- (void)showToolsMenuPopup {
- DCHECK(_browserState);
- DCHECK(self.visible || self.dismissingModal);
-
- // Record the time this menu was requested; to be stored in the configuration
- // object.
- NSDate* showToolsMenuPopupRequestDate = [NSDate date];
-
- // Dismiss the omnibox (if open).
- [_toolbarController cancelOmniboxEdit];
- // Dismiss the soft keyboard (if open).
- [[_model currentTab].webController dismissKeyboard];
- // Dismiss Find in Page focus.
- [self updateFindBar:NO shouldFocus:NO];
-
- ToolsMenuConfiguration* configuration =
- [[ToolsMenuConfiguration alloc] initWithDisplayView:[self view]];
- configuration.requestStartTime =
- showToolsMenuPopupRequestDate.timeIntervalSinceReferenceDate;
- if ([_model count] == 0)
- [configuration setNoOpenedTabs:YES];
-
- if (_isOffTheRecord)
- [configuration setInIncognito:YES];
-
- if (!_readingListMenuNotifier) {
- _readingListMenuNotifier = [[ReadingListMenuNotifier alloc]
- initWithReadingList:ReadingListModelFactory::GetForBrowserState(
- _browserState)];
- }
- [configuration setReadingListMenuNotifier:_readingListMenuNotifier];
-
- [configuration setUserAgentType:self.userAgentType];
-
- [_toolbarController showToolsMenuPopupWithConfiguration:configuration];
-
- ToolsPopupController* toolsPopupController =
- [_toolbarController toolsPopupController];
- if ([_model currentTab]) {
- BOOL isBookmarked = _toolbarModelIOS->IsCurrentTabBookmarked();
- [toolsPopupController setIsCurrentPageBookmarked:isBookmarked];
- [toolsPopupController setCanShowFindBar:self.canShowFindBar];
- [toolsPopupController setCanUseReaderMode:self.canUseReaderMode];
- [toolsPopupController setCanShowShareMenu:self.canShowShareMenu];
-
- if (!IsIPadIdiom())
- [toolsPopupController setIsTabLoading:_toolbarModelIOS->IsLoading()];
- }
-}
-
- (void)showPageInfoPopupForView:(UIView*)sourceView {
Tab* tab = [_model currentTab];
DCHECK([tab navigationManager]);
@@ -4058,6 +4005,56 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
originRect:[_toolbarController bookmarkButtonAnchorRect]];
}
+- (void)showToolsMenu {
+ DCHECK(_browserState);
+ DCHECK(self.visible || self.dismissingModal);
+
+ // Record the time this menu was requested; to be stored in the configuration
+ // object.
+ NSDate* showToolsMenuPopupRequestDate = [NSDate date];
+
+ // Dismiss the omnibox (if open).
+ [_toolbarController cancelOmniboxEdit];
+ // Dismiss the soft keyboard (if open).
+ [[_model currentTab].webController dismissKeyboard];
+ // Dismiss Find in Page focus.
+ [self updateFindBar:NO shouldFocus:NO];
+
+ ToolsMenuConfiguration* configuration =
+ [[ToolsMenuConfiguration alloc] initWithDisplayView:[self view]];
+ configuration.requestStartTime =
+ showToolsMenuPopupRequestDate.timeIntervalSinceReferenceDate;
+ if ([_model count] == 0)
+ [configuration setNoOpenedTabs:YES];
+
+ if (_isOffTheRecord)
+ [configuration setInIncognito:YES];
+
+ if (!_readingListMenuNotifier) {
+ _readingListMenuNotifier = [[ReadingListMenuNotifier alloc]
+ initWithReadingList:ReadingListModelFactory::GetForBrowserState(
+ _browserState)];
+ }
+ [configuration setReadingListMenuNotifier:_readingListMenuNotifier];
+
+ [configuration setUserAgentType:self.userAgentType];
+
+ [_toolbarController showToolsMenuPopupWithConfiguration:configuration];
+
+ ToolsPopupController* toolsPopupController =
+ [_toolbarController toolsPopupController];
+ if ([_model currentTab]) {
+ BOOL isBookmarked = _toolbarModelIOS->IsCurrentTabBookmarked();
+ [toolsPopupController setIsCurrentPageBookmarked:isBookmarked];
+ [toolsPopupController setCanShowFindBar:self.canShowFindBar];
+ [toolsPopupController setCanUseReaderMode:self.canUseReaderMode];
+ [toolsPopupController setCanShowShareMenu:self.canShowShareMenu];
+
+ if (!IsIPadIdiom())
+ [toolsPopupController setIsTabLoading:_toolbarModelIOS->IsLoading()];
+ }
+}
+
#pragma mark - Command Handling
- (IBAction)chromeExecuteCommand:(id)sender {
@@ -4141,10 +4138,6 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
case IDC_REQUEST_MOBILE_SITE:
[[_model currentTab] reloadWithUserAgentType:web::UserAgentType::MOBILE];
break;
- case IDC_SHOW_TOOLS_MENU: {
- [self showToolsMenuPopup];
- break;
- }
case IDC_SHOW_BOOKMARK_MANAGER: {
if (IsIPadIdiom()) {
[self showAllBookmarks];
« no previous file with comments | « ios/chrome/app/main_controller.mm ('k') | ios/chrome/browser/ui/commands/browser_commands.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698