65
65
#include " ui/gfx/geometry/size.h"
66
66
#include " ui/gfx/image/image.h"
67
67
68
+ using side_panel::customize_chrome::mojom::DescriptorDName;
69
+ using side_panel::customize_chrome::mojom::DescriptorDValue;
68
70
using side_panel::customize_chrome::mojom::UserFeedback;
71
+ using side_panel::customize_chrome::mojom::WallpaperSearchResult;
72
+ using side_panel::customize_chrome::mojom::WallpaperSearchResultPtr;
73
+ using side_panel::customize_chrome::mojom::WallpaperSearchStatus;
69
74
70
75
namespace {
71
76
@@ -323,28 +328,22 @@ void WallpaperSearchHandler::GetWallpaperSearchResults(
323
328
auto * identity_manager = IdentityManagerFactory::GetForProfile (profile_);
324
329
if (!identity_manager ||
325
330
!identity_manager->HasPrimaryAccount (signin::ConsentLevel::kSignin )) {
326
- std::move (callback).Run (
327
- side_panel::customize_chrome::mojom::WallpaperSearchStatus::kSignedOut ,
328
- std::vector<
329
- side_panel::customize_chrome::mojom::WallpaperSearchResultPtr>());
331
+ std::move (callback).Run (WallpaperSearchStatus::kSignedOut ,
332
+ std::vector<WallpaperSearchResultPtr>());
330
333
return ;
331
334
}
332
335
#if BUILDFLAG(IS_CHROMEOS)
333
336
// Check if user is browsing in guest mode.
334
337
if (profile_->IsGuestSession ()) {
335
- std::move (callback).Run (
336
- side_panel::customize_chrome::mojom::WallpaperSearchStatus::kSignedOut ,
337
- std::vector<
338
- side_panel::customize_chrome::mojom::WallpaperSearchResultPtr>());
338
+ std::move (callback).Run (WallpaperSearchStatus::kSignedOut ,
339
+ std::vector<WallpaperSearchResultPtr>());
339
340
return ;
340
341
}
341
342
#endif // BUILDFLAG(IS_CHROMEOS)
342
343
343
344
callback = mojo::WrapCallbackWithDefaultInvokeIfNotRun (
344
- std::move (callback),
345
- side_panel::customize_chrome::mojom::WallpaperSearchStatus::kError ,
346
- std::vector<
347
- side_panel::customize_chrome::mojom::WallpaperSearchResultPtr>());
345
+ std::move (callback), WallpaperSearchStatus::kError ,
346
+ std::vector<WallpaperSearchResultPtr>());
348
347
if (!base::FeatureList::IsEnabled (
349
348
ntp_features::kCustomizeChromeWallpaperSearch ) ||
350
349
!base::FeatureList::IsEnabled (
@@ -492,8 +491,7 @@ void WallpaperSearchHandler::SetBackgroundToInspirationImage(
492
491
493
492
void WallpaperSearchHandler::UpdateHistory () {
494
493
const auto & history = wallpaper_search_background_manager_->GetHistory ();
495
- std::vector<side_panel::customize_chrome::mojom::WallpaperSearchResultPtr>
496
- thumbnails;
494
+ std::vector<WallpaperSearchResultPtr> thumbnails;
497
495
498
496
auto barrier = base::BarrierCallback<std::pair<SkBitmap, base::Token>>(
499
497
history.size (), base::BindOnce (&WallpaperSearchHandler::OnHistoryDecoded,
@@ -707,8 +705,7 @@ void WallpaperSearchHandler::OnDescriptorsJsonParsed(
707
705
void WallpaperSearchHandler::OnHistoryDecoded (
708
706
std::vector<HistoryEntry> history,
709
707
std::vector<std::pair<SkBitmap, base::Token>> results) {
710
- std::vector<side_panel::customize_chrome::mojom::WallpaperSearchResultPtr>
711
- thumbnails;
708
+ std::vector<WallpaperSearchResultPtr> thumbnails;
712
709
713
710
// Use the original history array to order the results.
714
711
// O(n^2) but there should never be more than 6 in each vector.
@@ -725,8 +722,7 @@ void WallpaperSearchHandler::OnHistoryDecoded(
725
722
const bool success = gfx::PNGCodec::EncodeBGRASkBitmap (
726
723
small_bitmap, /* discard_transparency=*/ false , &encoded);
727
724
if (success) {
728
- auto thumbnail =
729
- side_panel::customize_chrome::mojom::WallpaperSearchResult::New ();
725
+ auto thumbnail = WallpaperSearchResult::New ();
730
726
thumbnail->image = base::Base64Encode (encoded);
731
727
thumbnail->id = std::move (id);
732
728
if (entry.subject ) {
@@ -839,9 +835,7 @@ void WallpaperSearchHandler::OnInspirationsJsonParsed(
839
835
descriptor_d_dict->FindString (" name" )) {
840
836
if (descriptor_d_name->compare (" Yellow" ) == 0 ) {
841
837
mojo_inspiration_group->descriptors ->color =
842
- side_panel::customize_chrome::mojom::DescriptorDValue::NewName (
843
- side_panel::customize_chrome::mojom::DescriptorDName::
844
- kYellow );
838
+ DescriptorDValue::NewName (DescriptorDName::kYellow );
845
839
}
846
840
}
847
841
}
@@ -943,11 +937,8 @@ void WallpaperSearchHandler::OnWallpaperSearchResultsRetrieved(
943
937
if (result.error ().error () ==
944
938
optimization_guide::OptimizationGuideModelExecutionError::
945
939
ModelExecutionError::kRequestThrottled ) {
946
- std::move (callback).Run (
947
- side_panel::customize_chrome::mojom::WallpaperSearchStatus::
948
- kRequestThrottled ,
949
- std::vector<
950
- side_panel::customize_chrome::mojom::WallpaperSearchResultPtr>());
940
+ std::move (callback).Run (WallpaperSearchStatus::kRequestThrottled ,
941
+ std::vector<WallpaperSearchResultPtr>());
951
942
}
952
943
return ;
953
944
}
@@ -1021,8 +1012,7 @@ void WallpaperSearchHandler::OnWallpaperSearchResultsDecoded(
1021
1012
std::vector<
1022
1013
std::pair<optimization_guide::proto::WallpaperSearchImageQuality*,
1023
1014
SkBitmap>> bitmaps) {
1024
- std::vector<side_panel::customize_chrome::mojom::WallpaperSearchResultPtr>
1025
- thumbnails;
1015
+ std::vector<WallpaperSearchResultPtr> thumbnails;
1026
1016
1027
1017
for (auto & [image_quality, bitmap] : bitmaps) {
1028
1018
auto dimensions =
@@ -1035,8 +1025,7 @@ void WallpaperSearchHandler::OnWallpaperSearchResultsDecoded(
1035
1025
const bool success = gfx::PNGCodec::EncodeBGRASkBitmap (
1036
1026
small_bitmap, /* discard_transparency=*/ false , &encoded);
1037
1027
if (success) {
1038
- auto thumbnail =
1039
- side_panel::customize_chrome::mojom::WallpaperSearchResult::New ();
1028
+ auto thumbnail = WallpaperSearchResult::New ();
1040
1029
auto id = base::Token::CreateRandom ();
1041
1030
wallpaper_search_results_[id] =
1042
1031
std::make_tuple (image_quality, std::nullopt , std::move (bitmap));
@@ -1049,9 +1038,7 @@ void WallpaperSearchHandler::OnWallpaperSearchResultsDecoded(
1049
1038
UmaHistogramMediumTimes (
1050
1039
" NewTabPage.WallpaperSearch.GetResultProcessingLatency" ,
1051
1040
processing_timer.Elapsed ());
1052
- std::move (callback).Run (
1053
- side_panel::customize_chrome::mojom::WallpaperSearchStatus::kOk ,
1054
- std::move (thumbnails));
1041
+ std::move (callback).Run (WallpaperSearchStatus::kOk , std::move (thumbnails));
1055
1042
}
1056
1043
1057
1044
void WallpaperSearchHandler::LaunchDelayedHatsSurvey () {
0 commit comments