Remove javascript icon from location bar

browser/ui/content_settings/brave_content_setting_image_models.cc

@@ -1,26 +1,28 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "brave/browser/ui/content_settings/brave_content_setting_image_models.h"
 
+#include "base/ranges/algorithm.h"
 #include "brave/browser/ui/content_settings/brave_autoplay_blocked_image_model.h"
 #include "third_party/widevine/cdm/buildflags.h"
 
+using ImageType = ContentSettingImageModel::ImageType;
+
 void BraveGenerateContentSettingImageModels(
-    std::vector<std::unique_ptr<ContentSettingImageModel>>& result) {
-  // Remove the cookies content setting image model
+    std::vector<std::unique_ptr<ContentSettingImageModel>>* result) {
+  // Remove the cookies and javascript content setting image model
   // https://github.com/brave/brave-browser/issues/1197
-  // TODO(iefremov): This changes break internal image models ordering which is
-  // based on enum values. This breaks tests and probably should be fixed
-  // (by adding more diff of course).
-  for (size_t i = 0; i < result.size(); i++) {
-    if (result[i]->image_type() ==
-        ContentSettingImageModel::ImageType::COOKIES) {
-      result.erase(result.begin() + i);
-      break;
-    }
-  }
+  // https://github.com/brave/brave-browser/issues/199
+  result->erase(
+      base::ranges::remove_if(*result,
+                              [](const auto& m) {
+                                return m->image_type() == ImageType::COOKIES ||
+                                       m->image_type() == ImageType::JAVASCRIPT;
+                              }),
+      result->end());
 
-  result.push_back(std::make_unique<BraveAutoplayBlockedImageModel>());
+  result->push_back(std::make_unique<BraveAutoplayBlockedImageModel>());
 }

browser/ui/content_settings/brave_content_setting_image_models.h

@@ -1,11 +1,17 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef BRAVE_BROWSER_UI_CONTENT_SETTINGS_BRAVE_CONTENT_SETTING_IMAGE_MODELS_H_
+#define BRAVE_BROWSER_UI_CONTENT_SETTINGS_BRAVE_CONTENT_SETTING_IMAGE_MODELS_H_
+
 #include <memory>
 #include <vector>
 
 class ContentSettingImageModel;
 
 void BraveGenerateContentSettingImageModels(
-    std::vector<std::unique_ptr<ContentSettingImageModel>>&);
+    std::vector<std::unique_ptr<ContentSettingImageModel>>*);
+
+#endif  // BRAVE_BROWSER_UI_CONTENT_SETTINGS_BRAVE_CONTENT_SETTING_IMAGE_MODELS_H_

chromium_src/chrome/browser/ui/content_settings/content_setting_image_model.cc

@@ -0,0 +1,21 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "chrome/browser/ui/content_settings/content_setting_image_model.h"
+
+#include "brave/browser/ui/content_settings/brave_content_setting_image_models.h"
+
+#define GenerateContentSettingImageModels \
+  GenerateContentSettingImageModels_ChromiumImpl
+#include "../../../../../../chrome/browser/ui/content_settings/content_setting_image_model.cc"
+#undef GenerateContentSettingImageModels
+
+std::vector<std::unique_ptr<ContentSettingImageModel>>
+ContentSettingImageModel::GenerateContentSettingImageModels() {
+  std::vector<std::unique_ptr<ContentSettingImageModel>> result =
+      GenerateContentSettingImageModels_ChromiumImpl();
+  BraveGenerateContentSettingImageModels(&result);
+  return result;
+}

chromium_src/chrome/browser/ui/content_settings/content_setting_image_model.h

@@ -0,0 +1,17 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_
+#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_
+
+#define GenerateContentSettingImageModels                       \
+  GenerateContentSettingImageModels_ChromiumImpl();             \
+  static std::vector<std::unique_ptr<ContentSettingImageModel>> \
+      GenerateContentSettingImageModels
+
+#include "../../../../../../chrome/browser/ui/content_settings/content_setting_image_model.h"
+#undef GenerateContentSettingImageModels
+
+#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_