Remove incognito advice from Sad Tab if already incognito

ios/chrome/browser/ui/sad_tab/sad_tab_view.mm

 // Copyright 2015 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/sad_tab/sad_tab_view.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/ui_metrics/sadtab_metrics_types.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
 #import "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/commands/open_url_command.h"
 #include "ios/chrome/browser/ui/rtl_geometry.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/url_loader.h"
 #import "ios/chrome/browser/ui/util/label_link_controller.h"
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
+#include "ios/web/public/browser_state.h"
 #include "ios/web/public/navigation_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 // Color constants.
@@ skipping 200 matching lines @@
       label = [[NSAttributedString alloc]
           initWithString:l10n_util::GetNSString(IDS_SAD_TAB_MESSAGE)];
       break;
     case SadTabViewMode::FEEDBACK: {
       NSString* feedbackIntroductionString = [NSString
           stringWithFormat:@"%@\n\n",
                            l10n_util::GetNSString(IDS_SAD_TAB_RELOAD_TRY)];
       NSMutableAttributedString* feedbackString =
           [[NSMutableAttributedString alloc]
               initWithString:feedbackIntroductionString];
+
+      BOOL isAlreadyInIncognitoMode =
+          _navigationManager->GetBrowserState()->IsOffTheRecord();
+      NSMutableArray* stringsArray = [NSMutableArray
+          arrayWithObjects:l10n_util::GetNSString(
+                               IDS_SAD_TAB_RELOAD_CLOSE_NOTABS),
+                           l10n_util::GetNSString(
+                               IDS_SAD_TAB_RELOAD_RESTART_BROWSER),
+                           l10n_util::GetNSString(
+                               IDS_SAD_TAB_RELOAD_RESTART_DEVICE),
+                           nil];

[kkhorimoto, 2017/06/22 00:33:31]

I think the formatting here would be much better if you use the @[] container
literal format.

[PL, 2017/06/22 15:15:38]

I agree, but unfortunately I am not able to make mutable arrays that way, and
need to remove the offending item from the array.

I could declare two arrays with an if/else... but that seemed to me to be more
duplicated code :-(.

[kkhorimoto, 2017/06/22 18:20:10]

[@[] mutableCopy], or [NSMutableArray arrayWithArray:@[]] would work, although
it's doing additional work solely for the sake of formatting.  This isn't code
that will be executed in a loop or anything, so I don't think the extra work
would be an issue.  That being said, feel free to leave as is if you want.

+      if (!isAlreadyInIncognitoMode) {
+        [stringsArray
+            insertObject:l10n_util::GetNSString(IDS_SAD_TAB_RELOAD_INCOGNITO)

[kkhorimoto, 2017/06/22 00:33:31]

Maybe declare the string on a separate line to help formatting a bit?

[PL, 2017/06/22 15:15:38]

Done! Thanks!

[kkhorimoto, 2017/06/22 18:20:10]

You said Done, but there's no new patch :)

+                 atIndex:1];
+      }
+
       NSAttributedString* bulletedListString =
-          [[self class] bulletedAttributedStringFromStrings:@[
-            l10n_util::GetNSString(IDS_SAD_TAB_RELOAD_CLOSE_NOTABS),
-            l10n_util::GetNSString(IDS_SAD_TAB_RELOAD_INCOGNITO),
-            l10n_util::GetNSString(IDS_SAD_TAB_RELOAD_RESTART_BROWSER),
-            l10n_util::GetNSString(IDS_SAD_TAB_RELOAD_RESTART_DEVICE)
-          ]];
+          [[self class] bulletedAttributedStringFromStrings:stringsArray];
       [feedbackString appendAttributedString:bulletedListString];
       label = feedbackString;
       break;
     }
   }
   DCHECK(label);
   return label;
 }
 
 - (nonnull NSString*)footerLabelText {
@@ skipping 313 matching lines @@
       break;
     }
   };
 }
 
 + (UIColor*)sadTabBackgroundColor {
   return [UIColor colorWithWhite:kBackgroundColorBrightness alpha:1.0];
 }
 
 @end