chromium/src
0
Fork 0
Code

scanner: Update disclaimer dialog illustration.

Browse Source 
Use finalised illustration provided by UX, and update image size and
background accordingly.

Bug: b:402588216
Change-Id: Id8936b7a6f88789c4919196899911756e71e810e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6396435
Reviewed-by: Xiaoqian Dai <xdai@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Michelle Chen <michellegc@google.com>
Cr-Commit-Position: refs/heads/main@{#1439145}
This commit is contained in:
Michelle Chen 2025-03-27 18:21:46 -07:00 committed by Chromium LUCI CQ
parent 6ce53e3fc7
commit 06a7224d74
4 changed files with 22 additions and 4 deletions

1
ash/capture_mode/DEPS

@ -1,6 +1,7 @@
include_rules = [
"+cc/trees/layer_tree_frame_sink.h",
"+cc/trees/layer_tree_frame_sink_client.h",
"+chromeos/ash/grit/ash_resources.h",
"+chromeos/ash/services/recording/public/mojom",
"+chromeos/ash/services/recording/recording_service_test_api.h",
"+components/capture_mode/camera_video_frame_handler.h",

19
ash/capture_mode/disclaimer_view.cc

@ -10,7 +10,6 @@
#include <utility>
#include <vector>
#include "ash/public/cpp/resources/grit/ash_public_unscaled_resources.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/style/color_provider.h"
#include "ash/shell.h"
@ -21,6 +20,7 @@
#include "base/functional/callback_forward.h"
#include "base/functional/callback_helpers.h"
#include "build/branding_buildflags.h"
#include "chromeos/ash/grit/ash_resources.h"
#include "components/vector_icons/vector_icons.h"
#include "ui/accessibility/ax_enums.mojom.h"
#include "ui/base/l10n/l10n_util.h"
@ -60,7 +60,7 @@ constexpr int kBetweenButtonsSpacing = 8;
constexpr int kButtonHeight = 32;
constexpr int kContainerBottomPadding = 28;
constexpr int kContainerPadding = 32;
constexpr int kImageHeight = 236;
constexpr int kImageHeight = 260;
constexpr int kImageWidth = 512;
constexpr int kWidgetWidth = kImageWidth;
constexpr int kRadius = 20;
@ -181,6 +181,15 @@ views::Builder<views::StyledLabel> GetParagraphThreeBuilder(
.SetID(DisclaimerViewId::kDisclaimerViewParagraphThreeId);
}
ui::ImageModel GetDisclaimerIllustration() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return ui::ImageModel::FromResourceId(
IDR_SCANNER_DISCLAIMER_ILLUSTRATION_PNG);
#else
return ui::ImageModel();
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
}
} // namespace
DisclaimerView::DisclaimerView(
@ -196,9 +205,11 @@ DisclaimerView::DisclaimerView(
cros_tokens::kCrosSysDialogContainer, kRadius));
SetPaintToLayer();
AddChildView(views::Builder<views::ImageView>()
.SetImage(ui::ImageModel::FromResourceId(
IDR_MAGIC_BOOST_DISCLAIMER_ILLUSTRATION))
.SetImage(GetDisclaimerIllustration())
.SetImageSize(kImagePreferredSize)
.SetPreferredSize(kImagePreferredSize)
.SetBackground(views::CreateSolidBackground(
cros_tokens::kCrosSysIlloColor12))
.Build());
AddChildView(

1
chromeos/ash/resources/ash_resources.grd

@ -21,6 +21,7 @@
</if>
<if expr="is_chrome_branded">
<part file="growth_framework_resources.grdp" />
<part file="scanner_resources.grdp" />
</if>
</includes>
</release>

5
chromeos/ash/resources/scanner_resources.grdp Normal file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<grit-part>
<!-- Resources for Scanner. -->
<include name="IDR_SCANNER_DISCLAIMER_ILLUSTRATION_PNG" file="../resources/internal/scanner_disclaimer_illustration.png" type="BINDATA" />
</grit-part>