[iOS] Add Request Mobile Site cell to tools menu

ios/chrome/browser/ui/browser_view_controller.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/browser_view_controller.h"
 
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <PassKit/PassKit.h>
 #import <Photos/Photos.h>
@@ skipping 498 matching lines @@
 // The browser's preload controller.
 @property(nonatomic, retain, readonly) PreloadController* preloadController;
 // The dialog presenter for this BVC's tab model.
 @property(nonatomic, retain, readonly) DialogPresenter* dialogPresenter;
 // The object that manages keyboard commands on behalf of the BVC.
 @property(nonatomic, retain, readonly) KeyCommandsProvider* keyCommandsProvider;
 // Whether the current tab can enable the reader mode menu item.
 @property(nonatomic, assign, readonly) BOOL canUseReaderMode;
 // Whether the current tab can enable the request desktop menu item.
 @property(nonatomic, assign, readonly) BOOL canUseDesktopUserAgent;
+// Whether the current tab can enable the request mobile menu item.
+@property(nonatomic, assign, readonly) BOOL canUseMobileUserAgent;
 // Whether the sharing menu should be enabled.
 @property(nonatomic, assign, readonly) BOOL canShowShareMenu;
 // Helper method to check web controller canShowFindBar method.
 @property(nonatomic, assign, readonly) BOOL canShowFindBar;
 // Whether the controller's view is currently available.
 // YES from viewWillAppear to viewWillDisappear.
 @property(nonatomic, assign, getter=isVisible) BOOL visible;
 // Whether the controller's view is currently visible.
 // YES from viewDidAppear to viewWillDisappear.
 @property(nonatomic, assign) BOOL viewVisible;
@@ skipping 89 matching lines @@
 // Shows a panel within the New Tab Page.
 - (void)showNTPPanel:(NewTabPage::PanelIdentifier)panel;
 // Shows the "rate this app" dialog.
 - (void)showRateThisAppDialog;
 // Dismisses the "rate this app" dialog.
 - (void)dismissRateThisAppDialog;
 #if !defined(NDEBUG)
 // Shows the source of the current page.
 - (void)viewSource;
 #endif
-// Whether the given tab's url begins with the chrome prefix.
-- (BOOL)isTabNativePage:(Tab*)tab;
+
+// True if "Request Desktop Site" should be visible in tools menu, otherwise,
+// make "Request Mobile Site" visible.
+- (BOOL)shouldShowRequestDesktopSite;
+
+// Whether the current tab is using desktop user agent.
+- (BOOL)isCurrentTabUsingDesktopUserAgent;
+
+// Whether the current tab's url begins with the chrome prefix.
+- (BOOL)isCurrentTabNativePage;
+
 // Returns the view to use when animating a page in or out, positioning it to
 // fill the content area but not actually adding it to the view hierarchy.
 - (UIImageView*)pageOpenCloseAnimationView;
 // Returns the view to use when animating full screen NTP paper in, filling the
 // entire screen but not actually adding it to the view hierarchy.
 - (UIImageView*)pageFullScreenOpenCloseAnimationView;
 // Updates the toolbar display based on the current tab.
 - (void)updateToolbar;
 // Updates |dialogPresenter|'s |active| property to account for the BVC's
 // |active| and |visible| properties.
@@ skipping 36 matching lines @@
 // Adds a CardView on top of the contentArea either taking the size of the full
 // screen or just the size of the space under the header.
 // Returns the CardView that was added.
 - (CardView*)addCardViewInFullscreen:(BOOL)fullScreen;
 // Called when either a tab finishes loading or when a tab with finished content
 // is added directly to the model via pre-rendering. The tab must be non-nil and
 // must be a member of the tab model controlled by this BrowserViewController.
 - (void)tabLoadComplete:(Tab*)tab withSuccess:(BOOL)success;
 // Evaluates Javascript asynchronously using the current page context.
 - (void)openJavascript:(NSString*)javascript;
+
 // Sets the desktop user agent flag and reload the current page.
-- (void)enableDesktopUserAgent;
+- (void)reloadPageWithDesktopUserAgent;
+
+// Sets the mobile user agent flag and reload the current page.
+- (void)reloadPageWithMobileUserAgent;
+
 // Helper methods used by ShareToDelegate methods.
 // Shows an alert with the given title and message id.
 - (void)showErrorAlert:(int)titleMessageId message:(int)messageId;
 // Helper method displaying an alert with the given title and message.
 // Dismisses previous alert if it has not been dismissed yet.
 - (void)showErrorAlertWithStringTitle:(NSString*)title
                               message:(NSString*)message;
 // Shows a self-dismissing snackbar displaying |message|.
 - (void)showSnackbar:(NSString*)message;
 // Induces an intentional crash in the browser process.
@@ skipping 358 matching lines @@
 }
 
 - (BOOL)canUseReaderMode {
   Tab* tab = [_model currentTab];
   if ([self isTabNativePage:tab])
     return NO;
 
   return [tab canSwitchToReaderMode];
 }
 
+- (BOOL)shouldShowRequestDesktopSite {
+  return [self isCurrentTabNativePage] ||
+         ![self isCurrentTabUsingDesktopUserAgent];
+}
+
 - (BOOL)canUseDesktopUserAgent {
-  Tab* tab = [_model currentTab];
-  if ([self isTabNativePage:tab])
-    return NO;
+  return ![self isCurrentTabNativePage] &&
+         ![self isCurrentTabUsingDesktopUserAgent];
+}
 
-  // If |useDesktopUserAgent| is |NO|, allow useDesktopUserAgent.
-  return !tab.usesDesktopUserAgent;
+- (BOOL)canUseMobileUserAgent {
+  return ![self isCurrentTabNativePage] &&
+         [self isCurrentTabUsingDesktopUserAgent];
+}
+
+- (BOOL)isCurrentTabNativePage {
+  return [self isTabNativePage:[_model currentTab]];
+}
+
+- (BOOL)isCurrentTabUsingDesktopUserAgent {
+  return [_model currentTab].usesDesktopUserAgent;

[kkhorimoto, 2017/02/25 02:36:32]

After updating the tools menu interface as I suggested, these functions
shouldn't be necessary anymore.  When setting up the tools menu, you can just
query [_model
currentTab].webState->GetNavigationManager()->GetVisibleItem()->GetUserAgentType().

[liaoyuke, 2017/02/27 17:34:22]

I personally do not like this type of function call, which violates the law of
demeter: https://en.wikipedia.org/wiki/Law_of_Demeter.

[liaoyuke, 2017/02/27 21:48:59]

I guess this is fine in the context of BVC, as BVC already knows about
everything, providing more layers of abstraction rarely makes a difference.

[kkhorimoto, 2017/02/27 23:44:23]

I definitely agree that layering violations should be avoided.  However,
everything in the ios/web/public/ directory is considered in the publicly
accessible layer.  So whenever an object has access to a WebState, any
functionality that is publicly exposed is not considered a layering violation.

 }
 
 // Whether the sharing menu should be shown.
 - (BOOL)canShowShareMenu {
   Tab* tab = [_model currentTab];
   // TODO(shreyasv): Make it so the URL returned by the tab is always valid and
   // remove check on net::NSURLWithGURL(tab.url) ( http://crbug.com/400999 ).
   return tab && !tab.url.SchemeIs(kChromeUIScheme) &&
          net::NSURLWithGURL(tab.url);
 }
@@ skipping 2199 matching lines @@
           initWithReadingList:ReadingListModelFactory::GetForBrowserState(
                                   _browserState)]);
     }
     [context setReadingListMenuNotifier:_readingListMenuNotifier];
   }
 
   [_toolbarController showToolsMenuPopupWithContext:context];
   ToolsPopupController* toolsPopupController =
       [_toolbarController toolsPopupController];
   if ([_model currentTab]) {
+    // Both "Request Desktop Site" and "Request Mobile Site" are visible by
+    // default, needs to hide exactly one of them.
+    if ([self shouldShowRequestDesktopSite])
+      [toolsPopupController hideRequestMobileSite];
+    else
+      [toolsPopupController hideRequestDesktopSite];

[kkhorimoto, 2017/02/25 02:36:32]

This code doesn't seem necessary, since we're already hiding the options from
the tools controller.

[liaoyuke, 2017/02/27 17:34:22]

Done.

+
     BOOL isBookmarked = _toolbarModelIOS->IsCurrentTabBookmarked();
     [toolsPopupController setIsCurrentPageBookmarked:isBookmarked];
     [toolsPopupController setCanShowFindBar:self.canShowFindBar];
     [toolsPopupController setCanUseReaderMode:self.canUseReaderMode];
     [toolsPopupController
         setCanUseDesktopUserAgent:self.canUseDesktopUserAgent];
+    [toolsPopupController setCanUseMobileUserAgent:self.canUseMobileUserAgent];
     [toolsPopupController setCanShowShareMenu:self.canShowShareMenu];
 
     if (!IsIPadIdiom())
       [toolsPopupController setIsTabLoading:_toolbarModelIOS->IsLoading()];
   }
 }
 
 - (void)showPageInfoPopupForView:(UIView*)sourceView {
   Tab* tab = [_model currentTab];
   DCHECK([tab navigationManager]);
@@ skipping 611 matching lines @@
     case IDC_SHARE_PAGE:
       [self sharePage];
       break;
     case IDC_SHOW_MAIL_COMPOSER:
       [self showMailComposer:sender];
       break;
     case IDC_READER_MODE:
       [[_model currentTab] switchToReaderMode];
       break;
     case IDC_REQUEST_DESKTOP_SITE:
-      [self enableDesktopUserAgent];
+      [self reloadPageWithDesktopUserAgent];
+      break;
+    case IDC_REQUEST_MOBILE_SITE:
+      [self reloadPageWithMobileUserAgent];
       break;
     case IDC_SHOW_TOOLS_MENU: {
       [self showToolsMenuPopup];
       break;
     }
     case IDC_SHOW_BOOKMARK_MANAGER: {
       if (IsIPadIdiom()) {
         [self showAllBookmarks];
       } else {
         [self initializeBookmarkInteractionController];
@@ skipping 188 matching lines @@
 
 - (void)showHelpPage {
   GURL helpUrl(l10n_util::GetStringUTF16(IDS_IOS_TOOLS_MENU_HELP_URL));
   [self webPageOrderedOpen:helpUrl
                   referrer:web::Referrer()
                 windowName:nil
               inBackground:NO
                   appendTo:kCurrentTab];
 }
 
-- (void)enableDesktopUserAgent {
-  [[_model currentTab] enableDesktopUserAgent];
-  [[_model currentTab] reloadForDesktopUserAgent];
+- (void)reloadPageWithDesktopUserAgent {
+  [[_model currentTab] activateDesktopUserAgent];
+  [[_model currentTab] reloadForUpdatedUserAgent];
+}
+
+- (void)reloadPageWithMobileUserAgent {

[kkhorimoto, 2017/02/25 02:36:32]

Please add a TODO here for the next step of feature.

[liaoyuke, 2017/02/27 17:34:22]

I'll leave this for next CL. In this one, I'll just add the UI cell and hide it.

 }
 
 - (void)resetAllWebViews {
   [_dialogPresenter cancelAllDialogs];
   [_model resetAllWebViews];
 }
 
 #pragma mark - Find Bar
 
 - (void)hideFindBarWithAnimation:(BOOL)animate {
@@ skipping 874 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end