diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 15:05:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:33:47 +0000 |
| commit | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch) | |
| tree | d55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/chrome/browser/extensions/api/extension_action | |
| parent | 2b94bfe47ccb6c08047959d1c26e392919550e86 (diff) | |
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/extension_action')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc | 6 | ||||
| -rw-r--r-- | chromium/chrome/browser/extensions/api/extension_action/extension_action_api.cc | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/chromium/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chromium/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc index aa5dd63eae4..bfebaa4d2ee 100644 --- a/chromium/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc +++ b/chromium/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc @@ -396,6 +396,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, InvisibleIconBrowserAction) { const std::string histogram_name = "Extensions.DynamicExtensionActionIconWasVisible"; + const std::string new_histogram_name = + "Extensions.DynamicExtensionActionIconWasVisibleRendered"; { base::HistogramTester histogram_tester; std::string result; @@ -408,6 +410,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, InvisibleIconBrowserAction) { GetBrowserActionsBar()->GetIcon(0))); EXPECT_THAT(histogram_tester.GetAllSamples(histogram_name), testing::ElementsAre(base::Bucket(0, 1))); + EXPECT_THAT(histogram_tester.GetAllSamples(new_histogram_name), + testing::ElementsAre(base::Bucket(0, 1))); } { @@ -422,6 +426,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, InvisibleIconBrowserAction) { GetBrowserActionsBar()->GetIcon(0))); EXPECT_THAT(histogram_tester.GetAllSamples(histogram_name), testing::ElementsAre(base::Bucket(1, 1))); + EXPECT_THAT(histogram_tester.GetAllSamples(new_histogram_name), + testing::ElementsAre(base::Bucket(1, 1))); } } diff --git a/chromium/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chromium/chrome/browser/extensions/api/extension_action/extension_action_api.cc index a12b3d54afa..8a1d28808e4 100644 --- a/chromium/chrome/browser/extensions/api/extension_action/extension_action_api.cc +++ b/chromium/chrome/browser/extensions/api/extension_action/extension_action_api.cc @@ -19,6 +19,7 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_action_runner.h" #include "chrome/browser/extensions/extension_tab_util.h" +#include "chrome/browser/extensions/extension_ui_util.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" @@ -448,11 +449,16 @@ ExtensionActionSetIconFunction::RunExtensionAction() { return RespondNow(Error("Icon invalid.")); gfx::Image icon_image(icon); - - const bool is_visible = - image_util::IsIconSufficientlyVisible(icon_image.AsBitmap()); + const SkBitmap bitmap = icon_image.AsBitmap(); + const bool is_visible = image_util::IsIconSufficientlyVisible(bitmap); UMA_HISTOGRAM_BOOLEAN("Extensions.DynamicExtensionActionIconWasVisible", is_visible); + const bool is_visible_rendered = + extensions::ui_util::IsRenderedIconSufficientlyVisibleForBrowserContext( + bitmap, browser_context()); + UMA_HISTOGRAM_BOOLEAN( + "Extensions.DynamicExtensionActionIconWasVisibleRendered", + is_visible_rendered); if (!is_visible && g_report_error_for_invisible_icon) return RespondNow(Error("Icon not sufficiently visible.")); |