[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 526 matching lines @@
 // Whether BVC prefers to hide the status bar. This value is used to determine
 // the response from the |prefersStatusBarHidden| method.
 @property(nonatomic, assign) BOOL hideStatusBar;
 // Whether the VoiceSearchBar should be displayed.
 @property(nonatomic, readonly) BOOL shouldShowVoiceSearchBar;
 // Coordinator for displaying a modal overlay with activity indicator to prevent
 // the user from interacting with the browser view.
 @property(nonatomic, retain)
     ActivityOverlayCoordinator* activityOverlayCoordinator;
 
+// The user agent type used to load the currently visible page. User agent type
+// is NONE if there is no visible page.

[Eugene But (OOO till 7-30), 2017/03/01 19:12:55]

Is this also NONE for pages where UA is not applicable?

[liaoyuke, 2017/03/03 01:04:06]

Done.

+@property(nonatomic, assign, readonly) web::UserAgentType userAgentType;
+
 // BVC initialization:
 // If the BVC is initialized with a valid browser state & tab model immediately,
 // the path is straightforward: functionality is enabled, and the UI is built
 // when -viewDidLoad is called.
 // If the BVC is initialized without a browser state or tab model, the tab model
 // and browser state may or may not be provided before -viewDidLoad is called.
 // In most cases, they will not, to improve startup performance.
 // In order to handle this, initialization of various aspects of BVC have been
 // broken out into the following functions, which have expectations (enforced
 // with DCHECKs) regarding |_browserState|, |_model|, and [self isViewLoaded].
@@ skipping 119 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;
+
+// Sets the desktop user agent flag and reload the current page.

[Eugene But (OOO till 7-30), 2017/03/01 19:12:54]

s/reload/reloads

[liaoyuke, 2017/03/03 01:04:06]

Done.

+- (void)enableMobileUserAgent;
+
 // 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 390 matching lines @@
   if (![controller canFindInPage])
     return NO;
 
   // Don't show twice.
   if (controller.findInPageModel.enabled)
     return NO;
 
   return YES;
 }
 
+- (web::UserAgentType)getUserAgentType {

[Eugene But (OOO till 7-30), 2017/03/01 19:12:55]

s/getUserAgentType/userAgentType

From "Coding Guidelines for Cocoa": The use of “get” is unnecessary, unless one
or more values are returned indirectly.

https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/Co...

[liaoyuke, 2017/03/03 01:04:05]

Done. Thank you for explaining with the reference!

+  web::UserAgentType userAgentType = web::UserAgentType::NONE;
+  web::NavigationManager* navigationManager =
+      [_model currentTab].webState->GetNavigationManager();
+
+  if (navigationManager && navigationManager->GetVisibleItem())

[Eugene But (OOO till 7-30), 2017/03/01 19:12:55]

navigationManager can not be null. webState can.

[liaoyuke, 2017/03/03 01:04:05]

Done.

+    userAgentType = navigationManager->GetVisibleItem()->GetUserAgentType();

[Eugene But (OOO till 7-30), 2017/03/01 19:12:55]

I don't think there is a guarantee that VisibleItem can never be null.

[liaoyuke, 2017/03/03 01:04:06]

Done.

+
+  return userAgentType;
+}
+
 - (void)setVisible:(BOOL)visible {
   if (_visible == visible)
     return;
   _visible = visible;
 }
 
 - (void)setViewVisible:(BOOL)viewVisible {
   if (_viewVisible == viewVisible)
     return;
   _viewVisible = viewVisible;
@@ skipping 2178 matching lines @@
   }
 
   [_toolbarController showToolsMenuPopupWithContext:context];
   ToolsPopupController* toolsPopupController =
       [_toolbarController toolsPopupController];
   if ([_model currentTab]) {
     BOOL isBookmarked = _toolbarModelIOS->IsCurrentTabBookmarked();
     [toolsPopupController setIsCurrentPageBookmarked:isBookmarked];
     [toolsPopupController setCanShowFindBar:self.canShowFindBar];
     [toolsPopupController setCanUseReaderMode:self.canUseReaderMode];
-    [toolsPopupController
-        setCanUseDesktopUserAgent:self.canUseDesktopUserAgent];
     [toolsPopupController setCanShowShareMenu:self.canShowShareMenu];
+    toolsPopupController.userAgentType = self.userAgentType;
 
     if (!IsIPadIdiom())
       [toolsPopupController setIsTabLoading:_toolbarModelIOS->IsLoading()];
   }
 }
 
 - (void)showPageInfoPopupForView:(UIView*)sourceView {
   Tab* tab = [_model currentTab];
   DCHECK([tab navigationManager]);
   web::NavigationItem* navItem = [tab navigationManager]->GetVisibleItem();
@@ skipping 612 matching lines @@
       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];
       break;
+    case IDC_REQUEST_MOBILE_SITE:
+      [self enableMobileUserAgent];
+      break;
     case IDC_SHOW_TOOLS_MENU: {
       [self showToolsMenuPopup];
       break;
     }
     case IDC_SHOW_BOOKMARK_MANAGER: {
       if (IsIPadIdiom()) {
         [self showAllBookmarks];
       } else {
         [self initializeBookmarkInteractionController];
         [_bookmarkInteractionController presentBookmarks];
@@ skipping 192 matching lines @@
                 windowName:nil
               inBackground:NO
                   appendTo:kCurrentTab];
 }
 
 - (void)enableDesktopUserAgent {
   [[_model currentTab] enableDesktopUserAgent];
   [[_model currentTab] reloadForDesktopUserAgent];
 }
 
+// TODO(crbug.com/692303): Implement the actual functionality of
+// "Request Mobile Site", and also refactoring the user agent related function
+// names to improve readability.
+- (void)enableMobileUserAgent {
+}
+
 - (void)resetAllWebViews {
   [_dialogPresenter cancelAllDialogs];
   [_model resetAllWebViews];
 }
 
 #pragma mark - Find Bar
 
 - (void)hideFindBarWithAnimation:(BOOL)animate {
   [_findBarController hideFindBarView:animate];
 }
@@ skipping 872 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end