Use new, preferred METADATA macros.
Bug: 1485768 Change-Id: I75ce714fdde26e495e40c35db6a043d16ef2120b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5253906 Reviewed-by: Trent Apted (tapted@chromium) <tapted@chromium.org> Commit-Queue: Allen Bauer <kylixrd@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/main@{#1255343}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
a64035999d
commit
6a86a5d32e
apps/ui/views
ash
ambient
ui
ambient_animation_view.ccambient_animation_view.hambient_background_image_view.ccambient_background_image_view.hambient_container_view.ccambient_container_view.hambient_info_view.ccambient_info_view.hambient_shield_view.ccambient_shield_view.hambient_slideshow_peripheral_ui.ccambient_slideshow_peripheral_ui.hglanceable_info_view.ccglanceable_info_view.hmedia_string_view.ccmedia_string_view.hphoto_view.ccphoto_view.h
app_list
views
app_list_bubble_apps_page.ccapp_list_bubble_apps_page.happ_list_bubble_search_page.ccapp_list_bubble_search_page.happ_list_folder_view.ccapp_list_folder_view.happ_list_item_view.ccapp_list_item_view.happ_list_search_view.ccapp_list_search_view.happ_list_toast_view.happs_grid_view.ccapps_grid_view.h
assistant
app_list_bubble_assistant_page.ccapp_list_bubble_assistant_page.hassistant_dialog_plate.ccassistant_dialog_plate.hassistant_main_stage.ccassistant_main_stage.hassistant_main_view.ccassistant_main_view.hassistant_page_view.ccassistant_page_view.h
continue_section_view.cccontinue_section_view.hcontinue_task_container_view.cccontinue_task_container_view.hcontinue_task_view.cccontinue_task_view.hrecent_apps_view.ccrecent_apps_view.hscrollable_apps_grid_view.ccscrollable_apps_grid_view.hsearch_result_actions_view.ccsearch_result_actions_view.hsearch_result_base_view.ccsearch_result_base_view.hsearch_result_image_list_view.ccsearch_result_image_list_view.hsearch_result_image_view.ccsearch_result_image_view.hsearch_result_page_view.ccsearch_result_view.ccsearch_result_view.h@ -406,7 +406,7 @@ void AppWindowFrameView::SetButtonImagesForFrame() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AppWindowFrameView, views::NonClientFrameView)
|
BEGIN_METADATA(AppWindowFrameView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace apps
|
} // namespace apps
|
||||||
|
@ -30,9 +30,9 @@ namespace apps {
|
|||||||
|
|
||||||
// A frameless or non-Ash, non-panel NonClientFrameView for app windows.
|
// A frameless or non-Ash, non-panel NonClientFrameView for app windows.
|
||||||
class AppWindowFrameView : public views::NonClientFrameView {
|
class AppWindowFrameView : public views::NonClientFrameView {
|
||||||
public:
|
METADATA_HEADER(AppWindowFrameView, views::NonClientFrameView)
|
||||||
METADATA_HEADER(AppWindowFrameView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
// AppWindowFrameView is used to draw frames for app windows when a non
|
// AppWindowFrameView is used to draw frames for app windows when a non
|
||||||
// standard frame is needed. This occurs if there is no frame needed, or if
|
// standard frame is needed. This occurs if there is no frame needed, or if
|
||||||
// there is a frame color.
|
// there is a frame color.
|
||||||
|
@ -454,7 +454,7 @@ JitterCalculator* AmbientAnimationView::GetJitterCalculatorForTesting() {
|
|||||||
return &animation_jitter_calculator_;
|
return &animation_jitter_calculator_;
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AmbientAnimationView, views::View)
|
BEGIN_METADATA(AmbientAnimationView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -45,9 +45,9 @@ class ASH_EXPORT AmbientAnimationView : public views::View,
|
|||||||
public views::ViewObserver,
|
public views::ViewObserver,
|
||||||
public GlanceableInfoView::Delegate,
|
public GlanceableInfoView::Delegate,
|
||||||
public MediaStringView::Delegate {
|
public MediaStringView::Delegate {
|
||||||
public:
|
METADATA_HEADER(AmbientAnimationView, views::View)
|
||||||
METADATA_HEADER(AmbientAnimationView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
AmbientAnimationView(
|
AmbientAnimationView(
|
||||||
AmbientViewDelegateImpl* view_delegate,
|
AmbientViewDelegateImpl* view_delegate,
|
||||||
AmbientAnimationProgressTracker* progress_tracker,
|
AmbientAnimationProgressTracker* progress_tracker,
|
||||||
|
@ -316,7 +316,7 @@ bool AmbientBackgroundImageView::HasPairedImages() const {
|
|||||||
return !image_unscaled_.isNull() && !related_image_unscaled_.isNull();
|
return !image_unscaled_.isNull() && !related_image_unscaled_.isNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AmbientBackgroundImageView, views::View)
|
BEGIN_METADATA(AmbientBackgroundImageView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -27,9 +27,9 @@ namespace ash {
|
|||||||
// interacts with the background photos.
|
// interacts with the background photos.
|
||||||
class ASH_EXPORT AmbientBackgroundImageView : public views::View,
|
class ASH_EXPORT AmbientBackgroundImageView : public views::View,
|
||||||
public views::ViewObserver {
|
public views::ViewObserver {
|
||||||
public:
|
METADATA_HEADER(AmbientBackgroundImageView, views::View)
|
||||||
METADATA_HEADER(AmbientBackgroundImageView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
explicit AmbientBackgroundImageView(AmbientViewDelegate* delegate);
|
explicit AmbientBackgroundImageView(AmbientViewDelegate* delegate);
|
||||||
AmbientBackgroundImageView(const AmbientBackgroundImageView&) = delete;
|
AmbientBackgroundImageView(const AmbientBackgroundImageView&) = delete;
|
||||||
AmbientBackgroundImageView& operator=(const AmbientBackgroundImageView&) =
|
AmbientBackgroundImageView& operator=(const AmbientBackgroundImageView&) =
|
||||||
|
@ -42,7 +42,7 @@ void AmbientContainerView::InitializeCommonSettings() {
|
|||||||
SetLayoutManager(std::make_unique<views::FillLayout>());
|
SetLayoutManager(std::make_unique<views::FillLayout>());
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AmbientContainerView, views::View)
|
BEGIN_METADATA(AmbientContainerView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -21,9 +21,9 @@ class AmbientOrientationMetricsRecorder;
|
|||||||
// Container view to display all Ambient Mode related views, i.e. photo frame,
|
// Container view to display all Ambient Mode related views, i.e. photo frame,
|
||||||
// weather info.
|
// weather info.
|
||||||
class ASH_EXPORT AmbientContainerView : public views::View {
|
class ASH_EXPORT AmbientContainerView : public views::View {
|
||||||
public:
|
METADATA_HEADER(AmbientContainerView, views::View)
|
||||||
METADATA_HEADER(AmbientContainerView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
// |main_rendering_view| should contain the primary content; it becomes a
|
// |main_rendering_view| should contain the primary content; it becomes a
|
||||||
// child of |AmbientContainerView|, and |AmbientContainerView| sets up some
|
// child of |AmbientContainerView|, and |AmbientContainerView| sets up some
|
||||||
// parameters in the view hierarchy that are common to all ambient UIs.
|
// parameters in the view hierarchy that are common to all ambient UIs.
|
||||||
|
@ -131,7 +131,7 @@ GlanceableInfoView* AmbientInfoView::GetGlanceableInfoViewForTesting() const {
|
|||||||
return glanceable_info_view_;
|
return glanceable_info_view_;
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AmbientInfoView, views::View)
|
BEGIN_METADATA(AmbientInfoView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -26,9 +26,9 @@ class GlanceableInfoView;
|
|||||||
|
|
||||||
class ASH_EXPORT AmbientInfoView : public views::View,
|
class ASH_EXPORT AmbientInfoView : public views::View,
|
||||||
public GlanceableInfoView::Delegate {
|
public GlanceableInfoView::Delegate {
|
||||||
public:
|
METADATA_HEADER(AmbientInfoView, views::View)
|
||||||
METADATA_HEADER(AmbientInfoView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
explicit AmbientInfoView(AmbientViewDelegate* delegate);
|
explicit AmbientInfoView(AmbientViewDelegate* delegate);
|
||||||
AmbientInfoView(const AmbientInfoView&) = delete;
|
AmbientInfoView(const AmbientInfoView&) = delete;
|
||||||
AmbientInfoView& operator=(AmbientInfoView&) = delete;
|
AmbientInfoView& operator=(AmbientInfoView&) = delete;
|
||||||
|
@ -127,7 +127,7 @@ void AmbientShieldView::InitLayout() {
|
|||||||
GradientBackground::Orientation::kVertical, colors));
|
GradientBackground::Orientation::kVertical, colors));
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AmbientShieldView, views::View)
|
BEGIN_METADATA(AmbientShieldView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -11,9 +11,9 @@
|
|||||||
namespace ash {
|
namespace ash {
|
||||||
|
|
||||||
class AmbientShieldView : public views::View {
|
class AmbientShieldView : public views::View {
|
||||||
public:
|
METADATA_HEADER(AmbientShieldView, views::View)
|
||||||
METADATA_HEADER(AmbientShieldView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
AmbientShieldView();
|
AmbientShieldView();
|
||||||
AmbientShieldView(const AmbientShieldView&) = delete;
|
AmbientShieldView(const AmbientShieldView&) = delete;
|
||||||
AmbientShieldView& operator=(const AmbientShieldView&) = delete;
|
AmbientShieldView& operator=(const AmbientShieldView&) = delete;
|
||||||
|
@ -119,7 +119,7 @@ void AmbientSlideshowPeripheralUi::UpdateImageDetails(
|
|||||||
ambient_info_view_->UpdateImageDetails(details, related_details);
|
ambient_info_view_->UpdateImageDetails(details, related_details);
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AmbientSlideshowPeripheralUi, views::View)
|
BEGIN_METADATA(AmbientSlideshowPeripheralUi)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -25,9 +25,9 @@ class JitterCalculator;
|
|||||||
// weather and media string that are shown in the slideshow's photo view.
|
// weather and media string that are shown in the slideshow's photo view.
|
||||||
class AmbientSlideshowPeripheralUi : public views::View,
|
class AmbientSlideshowPeripheralUi : public views::View,
|
||||||
public MediaStringView::Delegate {
|
public MediaStringView::Delegate {
|
||||||
public:
|
METADATA_HEADER(AmbientSlideshowPeripheralUi, views::View)
|
||||||
METADATA_HEADER(AmbientSlideshowPeripheralUi);
|
|
||||||
|
|
||||||
|
public:
|
||||||
explicit AmbientSlideshowPeripheralUi(AmbientViewDelegate* delegate);
|
explicit AmbientSlideshowPeripheralUi(AmbientViewDelegate* delegate);
|
||||||
~AmbientSlideshowPeripheralUi() override;
|
~AmbientSlideshowPeripheralUi() override;
|
||||||
|
|
||||||
|
@ -216,7 +216,7 @@ int GlanceableInfoView::GetTimeFontDescent() {
|
|||||||
return GetFontDescent(GetTimeFontList(time_font_size_dip_));
|
return GetFontDescent(GetTimeFontList(time_font_size_dip_));
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(GlanceableInfoView, views::View)
|
BEGIN_METADATA(GlanceableInfoView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -27,6 +27,8 @@ class TimeView;
|
|||||||
// Container for displaying a glanceable clock and weather info.
|
// Container for displaying a glanceable clock and weather info.
|
||||||
class ASH_EXPORT GlanceableInfoView : public views::View,
|
class ASH_EXPORT GlanceableInfoView : public views::View,
|
||||||
public AmbientWeatherModelObserver {
|
public AmbientWeatherModelObserver {
|
||||||
|
METADATA_HEADER(GlanceableInfoView, views::View)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
class Delegate {
|
class Delegate {
|
||||||
public:
|
public:
|
||||||
@ -36,8 +38,6 @@ class ASH_EXPORT GlanceableInfoView : public views::View,
|
|||||||
virtual SkColor GetTimeTemperatureFontColor() = 0;
|
virtual SkColor GetTimeTemperatureFontColor() = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
METADATA_HEADER(GlanceableInfoView);
|
|
||||||
|
|
||||||
GlanceableInfoView(
|
GlanceableInfoView(
|
||||||
AmbientViewDelegate* delegate,
|
AmbientViewDelegate* delegate,
|
||||||
GlanceableInfoView::Delegate* glanceable_info_view_delegate,
|
GlanceableInfoView::Delegate* glanceable_info_view_delegate,
|
||||||
|
@ -310,7 +310,7 @@ void MediaStringView::StartScrolling(bool is_initial) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(MediaStringView, views::View)
|
BEGIN_METADATA(MediaStringView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -31,6 +31,8 @@ class MediaStringView : public views::View,
|
|||||||
public views::ViewObserver,
|
public views::ViewObserver,
|
||||||
public media_session::mojom::MediaControllerObserver,
|
public media_session::mojom::MediaControllerObserver,
|
||||||
public ui::ImplicitAnimationObserver {
|
public ui::ImplicitAnimationObserver {
|
||||||
|
METADATA_HEADER(MediaStringView, views::View)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
struct Settings {
|
struct Settings {
|
||||||
SkColor icon_light_mode_color;
|
SkColor icon_light_mode_color;
|
||||||
@ -48,8 +50,6 @@ class MediaStringView : public views::View,
|
|||||||
virtual Settings GetSettings() = 0;
|
virtual Settings GetSettings() = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
METADATA_HEADER(MediaStringView);
|
|
||||||
|
|
||||||
explicit MediaStringView(MediaStringView::Delegate* delegate);
|
explicit MediaStringView(MediaStringView::Delegate* delegate);
|
||||||
MediaStringView(const MediaStringView&) = delete;
|
MediaStringView(const MediaStringView&) = delete;
|
||||||
MediaStringView& operator=(const MediaStringView&) = delete;
|
MediaStringView& operator=(const MediaStringView&) = delete;
|
||||||
|
@ -180,7 +180,7 @@ gfx::ImageSkia PhotoView::GetVisibleImageForTesting() {
|
|||||||
return image_views_.at(image_index_)->GetCurrentImage();
|
return image_views_.at(image_index_)->GetCurrentImage();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(PhotoView, views::View)
|
BEGIN_METADATA(PhotoView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -38,9 +38,9 @@ struct ASH_EXPORT PhotoViewConfig {
|
|||||||
class ASH_EXPORT PhotoView : public views::View,
|
class ASH_EXPORT PhotoView : public views::View,
|
||||||
public AmbientBackendModelObserver,
|
public AmbientBackendModelObserver,
|
||||||
public ui::ImplicitAnimationObserver {
|
public ui::ImplicitAnimationObserver {
|
||||||
public:
|
METADATA_HEADER(PhotoView, views::View)
|
||||||
METADATA_HEADER(PhotoView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
explicit PhotoView(AmbientViewDelegateImpl* delegate,
|
explicit PhotoView(AmbientViewDelegateImpl* delegate,
|
||||||
PhotoViewConfig view_config = PhotoViewConfig());
|
PhotoViewConfig view_config = PhotoViewConfig());
|
||||||
|
|
||||||
|
@ -983,7 +983,7 @@ void AppListBubbleAppsPage::OnToggleContinueSection() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AppListBubbleAppsPage, views::View)
|
BEGIN_METADATA(AppListBubbleAppsPage)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -61,9 +61,9 @@ class ASH_EXPORT AppListBubbleAppsPage
|
|||||||
public AppListModelProvider::Observer,
|
public AppListModelProvider::Observer,
|
||||||
public AppListToastContainerView::Delegate,
|
public AppListToastContainerView::Delegate,
|
||||||
public AppListViewProvider {
|
public AppListViewProvider {
|
||||||
public:
|
METADATA_HEADER(AppListBubbleAppsPage, views::View)
|
||||||
METADATA_HEADER(AppListBubbleAppsPage);
|
|
||||||
|
|
||||||
|
public:
|
||||||
AppListBubbleAppsPage(AppListViewDelegate* view_delegate,
|
AppListBubbleAppsPage(AppListViewDelegate* view_delegate,
|
||||||
ApplicationDragAndDropHost* drag_and_drop_host,
|
ApplicationDragAndDropHost* drag_and_drop_host,
|
||||||
AppListConfig* app_list_config,
|
AppListConfig* app_list_config,
|
||||||
|
@ -127,7 +127,7 @@ ui::Layer* AppListBubbleSearchPage::GetPageAnimationLayerForTest() {
|
|||||||
return search_view_->GetPageAnimationLayer();
|
return search_view_->GetPageAnimationLayer();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AppListBubbleSearchPage, views::View)
|
BEGIN_METADATA(AppListBubbleSearchPage)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -26,9 +26,9 @@ class SearchResultPageDialogController;
|
|||||||
// Contains a scrolling list of search results. Does not include the search box,
|
// Contains a scrolling list of search results. Does not include the search box,
|
||||||
// which is owned by a parent view.
|
// which is owned by a parent view.
|
||||||
class ASH_EXPORT AppListBubbleSearchPage : public views::View {
|
class ASH_EXPORT AppListBubbleSearchPage : public views::View {
|
||||||
public:
|
METADATA_HEADER(AppListBubbleSearchPage, views::View)
|
||||||
METADATA_HEADER(AppListBubbleSearchPage);
|
|
||||||
|
|
||||||
|
public:
|
||||||
AppListBubbleSearchPage(AppListViewDelegate* view_delegate,
|
AppListBubbleSearchPage(AppListViewDelegate* view_delegate,
|
||||||
SearchResultPageDialogController* dialog_controller,
|
SearchResultPageDialogController* dialog_controller,
|
||||||
SearchBoxView* search_box_view);
|
SearchBoxView* search_box_view);
|
||||||
|
@ -1297,7 +1297,7 @@ void AppListFolderView::CancelReparentDragFromRootGrid() {
|
|||||||
items_grid_view_->EndDrag(/*cancel=*/true);
|
items_grid_view_->EndDrag(/*cancel=*/true);
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AppListFolderView, views::View)
|
BEGIN_METADATA(AppListFolderView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -47,9 +47,9 @@ class ASH_EXPORT AppListFolderView : public views::View,
|
|||||||
public AppListModelObserver,
|
public AppListModelObserver,
|
||||||
public views::ViewObserver,
|
public views::ViewObserver,
|
||||||
public AppsGridViewFolderDelegate {
|
public AppsGridViewFolderDelegate {
|
||||||
public:
|
METADATA_HEADER(AppListFolderView, views::View)
|
||||||
METADATA_HEADER(AppListFolderView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
// The maximum number of columns a folder can have.
|
// The maximum number of columns a folder can have.
|
||||||
static constexpr int kMaxFolderColumns = 4;
|
static constexpr int kMaxFolderColumns = 4;
|
||||||
|
|
||||||
|
@ -2313,7 +2313,7 @@ bool AppListItemView::AlwaysPaintsToLayer() {
|
|||||||
return is_promise_app_ || progress_indicator_;
|
return is_promise_app_ || progress_indicator_;
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AppListItemView, views::Button)
|
BEGIN_METADATA(AppListItemView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -64,9 +64,9 @@ class ASH_EXPORT AppListItemView : public views::Button,
|
|||||||
public views::ContextMenuController,
|
public views::ContextMenuController,
|
||||||
public AppListItemObserver,
|
public AppListItemObserver,
|
||||||
public ui::ImplicitAnimationObserver {
|
public ui::ImplicitAnimationObserver {
|
||||||
public:
|
METADATA_HEADER(AppListItemView, views::Button)
|
||||||
METADATA_HEADER(AppListItemView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
// The types of context where the app list item view is shown.
|
// The types of context where the app list item view is shown.
|
||||||
enum class Context {
|
enum class Context {
|
||||||
// The item is shown in an AppsGridView.
|
// The item is shown in an AppsGridView.
|
||||||
|
@ -522,7 +522,7 @@ ui::Layer* AppListSearchView::GetPageAnimationLayer() const {
|
|||||||
return scroll_view_->contents()->layer();
|
return scroll_view_->contents()->layer();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AppListSearchView, views::View)
|
BEGIN_METADATA(AppListSearchView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -38,9 +38,9 @@ class SearchResultImageListView;
|
|||||||
class ASH_EXPORT AppListSearchView : public views::View,
|
class ASH_EXPORT AppListSearchView : public views::View,
|
||||||
public SearchResultContainerView::Delegate,
|
public SearchResultContainerView::Delegate,
|
||||||
public AppListModelProvider::Observer {
|
public AppListModelProvider::Observer {
|
||||||
public:
|
METADATA_HEADER(AppListSearchView, views::View)
|
||||||
METADATA_HEADER(AppListSearchView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
AppListSearchView(AppListViewDelegate* view_delegate,
|
AppListSearchView(AppListViewDelegate* view_delegate,
|
||||||
SearchResultPageDialogController* dialog_controller,
|
SearchResultPageDialogController* dialog_controller,
|
||||||
SearchBoxView* search_box_view);
|
SearchBoxView* search_box_view);
|
||||||
|
@ -116,9 +116,9 @@ class ASH_EXPORT AppListToastView : public views::View {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
class ToastPillButton : public PillButton {
|
class ToastPillButton : public PillButton {
|
||||||
public:
|
METADATA_HEADER(ToastPillButton, PillButton)
|
||||||
METADATA_HEADER(ToastPillButton);
|
|
||||||
|
|
||||||
|
public:
|
||||||
ToastPillButton(AppListViewDelegate* view_delegate,
|
ToastPillButton(AppListViewDelegate* view_delegate,
|
||||||
PressedCallback callback,
|
PressedCallback callback,
|
||||||
const std::u16string& text,
|
const std::u16string& text,
|
||||||
|
@ -3728,7 +3728,7 @@ void AppsGridView::OnIdealBoundsAnimationDone() {
|
|||||||
DestroyLayerItemsIfNotNeeded();
|
DestroyLayerItemsIfNotNeeded();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AppsGridView, views::View)
|
BEGIN_METADATA(AppsGridView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -70,9 +70,9 @@ class ASH_EXPORT AppsGridView : public views::View,
|
|||||||
public AppListItemListObserver,
|
public AppListItemListObserver,
|
||||||
public AppListItemObserver,
|
public AppListItemObserver,
|
||||||
public AppListModelObserver {
|
public AppListModelObserver {
|
||||||
public:
|
METADATA_HEADER(AppsGridView, views::View)
|
||||||
METADATA_HEADER(AppsGridView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
enum Pointer {
|
enum Pointer {
|
||||||
NONE,
|
NONE,
|
||||||
MOUSE,
|
MOUSE,
|
||||||
|
@ -51,7 +51,7 @@ void AppListBubbleAssistantPage::InitializeUIForBubbleView() {
|
|||||||
main_stage_->InitializeUIForBubbleView();
|
main_stage_->InitializeUIForBubbleView();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AppListBubbleAssistantPage, views::View)
|
BEGIN_METADATA(AppListBubbleAssistantPage)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -19,9 +19,9 @@ class AssistantViewDelegate;
|
|||||||
// The assistant page for the app list bubble / clamshell launcher. Similar to
|
// The assistant page for the app list bubble / clamshell launcher. Similar to
|
||||||
// AssistantMainView in the fullscreen launcher.
|
// AssistantMainView in the fullscreen launcher.
|
||||||
class ASH_EXPORT AppListBubbleAssistantPage : public views::View {
|
class ASH_EXPORT AppListBubbleAssistantPage : public views::View {
|
||||||
public:
|
METADATA_HEADER(AppListBubbleAssistantPage, views::View)
|
||||||
METADATA_HEADER(AppListBubbleAssistantPage);
|
|
||||||
|
|
||||||
|
public:
|
||||||
explicit AppListBubbleAssistantPage(AssistantViewDelegate* delegate);
|
explicit AppListBubbleAssistantPage(AssistantViewDelegate* delegate);
|
||||||
AppListBubbleAssistantPage(const AppListBubbleAssistantPage&) = delete;
|
AppListBubbleAssistantPage(const AppListBubbleAssistantPage&) = delete;
|
||||||
AppListBubbleAssistantPage& operator=(const AppListBubbleAssistantPage&) =
|
AppListBubbleAssistantPage& operator=(const AppListBubbleAssistantPage&) =
|
||||||
|
@ -522,7 +522,7 @@ InputModality AssistantDialogPlate::input_modality() const {
|
|||||||
return AssistantInteractionController::Get()->GetModel()->input_modality();
|
return AssistantInteractionController::Get()->GetModel()->input_modality();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AssistantDialogPlate, views::View)
|
BEGIN_METADATA(AssistantDialogPlate)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -49,9 +49,9 @@ class ASH_EXPORT AssistantDialogPlate
|
|||||||
public AssistantInteractionModelObserver,
|
public AssistantInteractionModelObserver,
|
||||||
public AssistantUiModelObserver,
|
public AssistantUiModelObserver,
|
||||||
public AssistantButtonListener {
|
public AssistantButtonListener {
|
||||||
public:
|
METADATA_HEADER(AssistantDialogPlate, views::View)
|
||||||
METADATA_HEADER(AssistantDialogPlate);
|
|
||||||
|
|
||||||
|
public:
|
||||||
explicit AssistantDialogPlate(AssistantViewDelegate* delegate);
|
explicit AssistantDialogPlate(AssistantViewDelegate* delegate);
|
||||||
AssistantDialogPlate(const AssistantDialogPlate&) = delete;
|
AssistantDialogPlate(const AssistantDialogPlate&) = delete;
|
||||||
AssistantDialogPlate& operator=(const AssistantDialogPlate&) = delete;
|
AssistantDialogPlate& operator=(const AssistantDialogPlate&) = delete;
|
||||||
|
@ -510,7 +510,7 @@ void AppListAssistantMainStage::InitializeUIForStartingSession(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AppListAssistantMainStage, views::View)
|
BEGIN_METADATA(AppListAssistantMainStage)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -37,9 +37,9 @@ class ASH_EXPORT AppListAssistantMainStage
|
|||||||
public AssistantControllerObserver,
|
public AssistantControllerObserver,
|
||||||
public AssistantInteractionModelObserver,
|
public AssistantInteractionModelObserver,
|
||||||
public AssistantUiModelObserver {
|
public AssistantUiModelObserver {
|
||||||
public:
|
METADATA_HEADER(AppListAssistantMainStage, views::View)
|
||||||
METADATA_HEADER(AppListAssistantMainStage);
|
|
||||||
|
|
||||||
|
public:
|
||||||
explicit AppListAssistantMainStage(AssistantViewDelegate* delegate);
|
explicit AppListAssistantMainStage(AssistantViewDelegate* delegate);
|
||||||
AppListAssistantMainStage(const AppListAssistantMainStage&) = delete;
|
AppListAssistantMainStage(const AppListAssistantMainStage&) = delete;
|
||||||
AppListAssistantMainStage& operator=(const AppListAssistantMainStage&) =
|
AppListAssistantMainStage& operator=(const AppListAssistantMainStage&) =
|
||||||
|
@ -133,7 +133,7 @@ void AssistantMainView::InitLayout() {
|
|||||||
layout->SetFlexForView(main_stage_, 1);
|
layout->SetFlexForView(main_stage_, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AssistantMainView, views::View)
|
BEGIN_METADATA(AssistantMainView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -24,9 +24,9 @@ class AssistantViewDelegate;
|
|||||||
class ASH_EXPORT AssistantMainView : public views::View,
|
class ASH_EXPORT AssistantMainView : public views::View,
|
||||||
public AssistantControllerObserver,
|
public AssistantControllerObserver,
|
||||||
public AssistantUiModelObserver {
|
public AssistantUiModelObserver {
|
||||||
public:
|
METADATA_HEADER(AssistantMainView, views::View)
|
||||||
METADATA_HEADER(AssistantMainView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
explicit AssistantMainView(AssistantViewDelegate* delegate);
|
explicit AssistantMainView(AssistantViewDelegate* delegate);
|
||||||
AssistantMainView(const AssistantMainView&) = delete;
|
AssistantMainView(const AssistantMainView&) = delete;
|
||||||
AssistantMainView& operator=(const AssistantMainView&) = delete;
|
AssistantMainView& operator=(const AssistantMainView&) = delete;
|
||||||
|
@ -441,7 +441,7 @@ void AssistantPageView::UpdateBackground(bool in_tablet_mode) {
|
|||||||
layer()->SetColor(SK_ColorWHITE);
|
layer()->SetColor(SK_ColorWHITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(AssistantPageView, views::View)
|
BEGIN_METADATA(AssistantPageView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -35,9 +35,9 @@ class ASH_EXPORT AssistantPageView : public AppListPage,
|
|||||||
public AssistantControllerObserver,
|
public AssistantControllerObserver,
|
||||||
public AssistantUiModelObserver,
|
public AssistantUiModelObserver,
|
||||||
public display::DisplayObserver {
|
public display::DisplayObserver {
|
||||||
public:
|
METADATA_HEADER(AssistantPageView, AppListPage)
|
||||||
METADATA_HEADER(AssistantPageView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
explicit AssistantPageView(AssistantViewDelegate* assistant_view_delegate);
|
explicit AssistantPageView(AssistantViewDelegate* assistant_view_delegate);
|
||||||
AssistantPageView(const AssistantPageView&) = delete;
|
AssistantPageView(const AssistantPageView&) = delete;
|
||||||
AssistantPageView& operator=(const AssistantPageView&) = delete;
|
AssistantPageView& operator=(const AssistantPageView&) = delete;
|
||||||
|
@ -491,7 +491,7 @@ void ContinueSectionView::ConfigureLayoutForAvailableWidth(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(ContinueSectionView, views::View)
|
BEGIN_METADATA(ContinueSectionView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -28,9 +28,9 @@ class ASH_EXPORT ContinueSectionView : public views::View,
|
|||||||
public views::FocusChangeListener,
|
public views::FocusChangeListener,
|
||||||
public AppListModelProvider::Observer,
|
public AppListModelProvider::Observer,
|
||||||
public AppListControllerObserver {
|
public AppListControllerObserver {
|
||||||
public:
|
METADATA_HEADER(ContinueSectionView, views::View)
|
||||||
METADATA_HEADER(ContinueSectionView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
ContinueSectionView(AppListViewDelegate* view_delegate,
|
ContinueSectionView(AppListViewDelegate* view_delegate,
|
||||||
int columns,
|
int columns,
|
||||||
bool tablet_mode);
|
bool tablet_mode);
|
||||||
|
@ -592,7 +592,7 @@ int ContinueTaskContainerView::GetIndexOfFocusedTaskView() const {
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(ContinueTaskContainerView, views::View)
|
BEGIN_METADATA(ContinueTaskContainerView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -38,9 +38,9 @@ class ContinueTaskView;
|
|||||||
// layout with the number of columns specified at construction.
|
// layout with the number of columns specified at construction.
|
||||||
class ASH_EXPORT ContinueTaskContainerView : public ui::ListModelObserver,
|
class ASH_EXPORT ContinueTaskContainerView : public ui::ListModelObserver,
|
||||||
public views::View {
|
public views::View {
|
||||||
public:
|
METADATA_HEADER(ContinueTaskContainerView, views::View)
|
||||||
METADATA_HEADER(ContinueTaskContainerView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
using OnResultsChanged = base::RepeatingClosure;
|
using OnResultsChanged = base::RepeatingClosure;
|
||||||
|
|
||||||
ContinueTaskContainerView(AppListViewDelegate* view_delegate,
|
ContinueTaskContainerView(AppListViewDelegate* view_delegate,
|
||||||
|
@ -422,7 +422,7 @@ void ContinueTaskView::LogMetricsOnResultRemoved() {
|
|||||||
GetTaskResultType(), TaskResultType::kMaxValue);
|
GetTaskResultType(), TaskResultType::kMaxValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(ContinueTaskView, views::View)
|
BEGIN_METADATA(ContinueTaskView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -38,6 +38,8 @@ class ASH_EXPORT ContinueTaskView : public views::Button,
|
|||||||
public views::ContextMenuController,
|
public views::ContextMenuController,
|
||||||
public ui::SimpleMenuModel::Delegate,
|
public ui::SimpleMenuModel::Delegate,
|
||||||
public SearchResultObserver {
|
public SearchResultObserver {
|
||||||
|
METADATA_HEADER(ContinueTaskView, views::Button)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// The type of result for the task.
|
// The type of result for the task.
|
||||||
// These values are used for metrics and should not be changed.
|
// These values are used for metrics and should not be changed.
|
||||||
@ -48,8 +50,6 @@ class ASH_EXPORT ContinueTaskView : public views::Button,
|
|||||||
kMaxValue = kUnknown,
|
kMaxValue = kUnknown,
|
||||||
};
|
};
|
||||||
|
|
||||||
METADATA_HEADER(ContinueTaskView);
|
|
||||||
|
|
||||||
ContinueTaskView(AppListViewDelegate* view_delegate, bool tablet_mode);
|
ContinueTaskView(AppListViewDelegate* view_delegate, bool tablet_mode);
|
||||||
ContinueTaskView(const ContinueTaskView&) = delete;
|
ContinueTaskView(const ContinueTaskView&) = delete;
|
||||||
ContinueTaskView& operator=(const ContinueTaskView&) = delete;
|
ContinueTaskView& operator=(const ContinueTaskView&) = delete;
|
||||||
|
@ -341,7 +341,7 @@ int RecentAppsView::CalculateTilePadding() const {
|
|||||||
return width_to_distribute / ((kMaxRecommendedApps - 1) * 2);
|
return width_to_distribute / ((kMaxRecommendedApps - 1) * 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(RecentAppsView, views::View)
|
BEGIN_METADATA(RecentAppsView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -32,9 +32,9 @@ class SearchModel;
|
|||||||
// a list of app icons.
|
// a list of app icons.
|
||||||
class ASH_EXPORT RecentAppsView : public AppListModelObserver,
|
class ASH_EXPORT RecentAppsView : public AppListModelObserver,
|
||||||
public views::View {
|
public views::View {
|
||||||
public:
|
METADATA_HEADER(RecentAppsView, views::View)
|
||||||
METADATA_HEADER(RecentAppsView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
RecentAppsView(AppListKeyboardController* keyboard_controller,
|
RecentAppsView(AppListKeyboardController* keyboard_controller,
|
||||||
AppListViewDelegate* view_delegate);
|
AppListViewDelegate* view_delegate);
|
||||||
RecentAppsView(const RecentAppsView&) = delete;
|
RecentAppsView(const RecentAppsView&) = delete;
|
||||||
|
@ -376,7 +376,7 @@ const gfx::Vector2d ScrollableAppsGridView::CalculateTransitionOffset(
|
|||||||
return gfx::Vector2d();
|
return gfx::Vector2d();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(ScrollableAppsGridView, AppsGridView)
|
BEGIN_METADATA(ScrollableAppsGridView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -28,9 +28,9 @@ class AppListViewDelegate;
|
|||||||
// feature where the user can drag an app icon to the top or bottom of the
|
// feature where the user can drag an app icon to the top or bottom of the
|
||||||
// containing ScrollView and the view will be scrolled automatically.
|
// containing ScrollView and the view will be scrolled automatically.
|
||||||
class ASH_EXPORT ScrollableAppsGridView : public AppsGridView {
|
class ASH_EXPORT ScrollableAppsGridView : public AppsGridView {
|
||||||
public:
|
METADATA_HEADER(ScrollableAppsGridView, AppsGridView)
|
||||||
METADATA_HEADER(ScrollableAppsGridView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
ScrollableAppsGridView(AppListA11yAnnouncer* a11y_announcer,
|
ScrollableAppsGridView(AppListA11yAnnouncer* a11y_announcer,
|
||||||
AppListViewDelegate* view_delegate,
|
AppListViewDelegate* view_delegate,
|
||||||
AppsGridViewFolderDelegate* folder_delegate,
|
AppsGridViewFolderDelegate* folder_delegate,
|
||||||
|
@ -47,9 +47,9 @@ constexpr int kActionButtonBetweenSpacing = 8;
|
|||||||
|
|
||||||
// SearchResultActionButton renders the button defined by SearchResult::Action.
|
// SearchResultActionButton renders the button defined by SearchResult::Action.
|
||||||
class SearchResultActionButton : public IconButton {
|
class SearchResultActionButton : public IconButton {
|
||||||
public:
|
METADATA_HEADER(SearchResultActionButton, IconButton)
|
||||||
METADATA_HEADER(SearchResultActionButton);
|
|
||||||
|
|
||||||
|
public:
|
||||||
SearchResultActionButton(SearchResultActionsView* parent,
|
SearchResultActionButton(SearchResultActionsView* parent,
|
||||||
const SearchResult::Action& action,
|
const SearchResult::Action& action,
|
||||||
PressedCallback callback,
|
PressedCallback callback,
|
||||||
@ -134,7 +134,7 @@ int SearchResultActionButton::GetButtonRadius() const {
|
|||||||
return width() / 2;
|
return width() / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(SearchResultActionButton, IconButton)
|
BEGIN_METADATA(SearchResultActionButton)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
SearchResultActionsView::SearchResultActionsView(
|
SearchResultActionsView::SearchResultActionsView(
|
||||||
@ -272,7 +272,7 @@ void SearchResultActionsView::ChildVisibilityChanged(views::View* child) {
|
|||||||
PreferredSizeChanged();
|
PreferredSizeChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(SearchResultActionsView, views::View)
|
BEGIN_METADATA(SearchResultActionsView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -21,9 +21,9 @@ class SearchResultView;
|
|||||||
// SearchResultActionsView displays a SearchResult::Actions in a button
|
// SearchResultActionsView displays a SearchResult::Actions in a button
|
||||||
// strip. Each action is presented as a button and horizontally laid out.
|
// strip. Each action is presented as a button and horizontally laid out.
|
||||||
class ASH_EXPORT SearchResultActionsView : public views::View {
|
class ASH_EXPORT SearchResultActionsView : public views::View {
|
||||||
public:
|
METADATA_HEADER(SearchResultActionsView, views::View)
|
||||||
METADATA_HEADER(SearchResultActionsView);
|
|
||||||
|
|
||||||
|
public:
|
||||||
explicit SearchResultActionsView(SearchResultActionsViewDelegate* delegate);
|
explicit SearchResultActionsView(SearchResultActionsViewDelegate* delegate);
|
||||||
|
|
||||||
SearchResultActionsView(const SearchResultActionsView&) = delete;
|
SearchResultActionsView(const SearchResultActionsView&) = delete;
|
||||||
|
@ -179,7 +179,7 @@ void SearchResultBaseView::ClearSelectedResultAction() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(SearchResultBaseView, views::Button)
|
BEGIN_METADATA(SearchResultBaseView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -22,8 +22,9 @@ class SearchResultActionsView;
|
|||||||
// Base class for views that observe and display a search result
|
// Base class for views that observe and display a search result
|
||||||
class ASH_EXPORT SearchResultBaseView : public views::Button,
|
class ASH_EXPORT SearchResultBaseView : public views::Button,
|
||||||
public SearchResultObserver {
|
public SearchResultObserver {
|
||||||
|
METADATA_HEADER(SearchResultBaseView, views::Button)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
METADATA_HEADER(SearchResultBaseView);
|
|
||||||
SearchResultBaseView();
|
SearchResultBaseView();
|
||||||
|
|
||||||
SearchResultBaseView(const SearchResultBaseView&) = delete;
|
SearchResultBaseView(const SearchResultBaseView&) = delete;
|
||||||
|
@ -282,7 +282,7 @@ std::vector<views::View*> SearchResultImageListView::GetViewsToAnimate() {
|
|||||||
return {image_view_container_};
|
return {image_view_container_};
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(SearchResultImageListView, SearchResultContainerView)
|
BEGIN_METADATA(SearchResultImageListView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -23,8 +23,9 @@ namespace ash {
|
|||||||
// SearchResultImageListView displays a horizontal strip of
|
// SearchResultImageListView displays a horizontal strip of
|
||||||
// SearchResultImageViews inside the AppListSearchView.
|
// SearchResultImageViews inside the AppListSearchView.
|
||||||
class ASH_EXPORT SearchResultImageListView : public SearchResultContainerView {
|
class ASH_EXPORT SearchResultImageListView : public SearchResultContainerView {
|
||||||
|
METADATA_HEADER(SearchResultImageListView, SearchResultContainerView)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
METADATA_HEADER(SearchResultImageListView);
|
|
||||||
explicit SearchResultImageListView(AppListViewDelegate* view_delegate);
|
explicit SearchResultImageListView(AppListViewDelegate* view_delegate);
|
||||||
SearchResultImageListView(const SearchResultImageListView&) = delete;
|
SearchResultImageListView(const SearchResultImageListView&) = delete;
|
||||||
SearchResultImageListView& operator=(const SearchResultImageListView&) =
|
SearchResultImageListView& operator=(const SearchResultImageListView&) =
|
||||||
|
@ -48,8 +48,9 @@ constexpr gfx::Insets kFocusRingInsets =
|
|||||||
constexpr double kDraggedImageOpacity = 0.6;
|
constexpr double kDraggedImageOpacity = 0.6;
|
||||||
|
|
||||||
class ImagePreviewView : public views::ImageButton {
|
class ImagePreviewView : public views::ImageButton {
|
||||||
|
METADATA_HEADER(ImagePreviewView, views::ImageButton)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
METADATA_HEADER(ImagePreviewView);
|
|
||||||
ImagePreviewView() {
|
ImagePreviewView() {
|
||||||
SetInstallFocusRingOnFocus(false);
|
SetInstallFocusRingOnFocus(false);
|
||||||
SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
|
SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
|
||||||
@ -74,7 +75,7 @@ class ImagePreviewView : public views::ImageButton {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
BEGIN_METADATA(ImagePreviewView, views::ImageButton)
|
BEGIN_METADATA(ImagePreviewView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
@ -199,7 +200,7 @@ void SearchResultImageView::OnMetadataChanged() {
|
|||||||
|
|
||||||
SearchResultImageView::~SearchResultImageView() = default;
|
SearchResultImageView::~SearchResultImageView() = default;
|
||||||
|
|
||||||
BEGIN_METADATA(SearchResultImageView, SearchResultBaseView)
|
BEGIN_METADATA(SearchResultImageView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -21,8 +21,9 @@ class SearchResultImageViewDelegate;
|
|||||||
|
|
||||||
// Displays a search result in the form of an unlabeled image.
|
// Displays a search result in the form of an unlabeled image.
|
||||||
class ASH_EXPORT SearchResultImageView : public SearchResultBaseView {
|
class ASH_EXPORT SearchResultImageView : public SearchResultBaseView {
|
||||||
|
METADATA_HEADER(SearchResultImageView, SearchResultBaseView)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
METADATA_HEADER(SearchResultImageView);
|
|
||||||
SearchResultImageView(int index,
|
SearchResultImageView(int index,
|
||||||
SearchResultImageListView* list_view,
|
SearchResultImageListView* list_view,
|
||||||
SearchResultImageViewDelegate* image_view_delegate);
|
SearchResultImageViewDelegate* image_view_delegate);
|
||||||
|
@ -66,8 +66,9 @@ constexpr base::TimeDelta kDecreasingHeightSearchResultsDuration =
|
|||||||
// A container view that ensures the card background and the shadow are painted
|
// A container view that ensures the card background and the shadow are painted
|
||||||
// in the correct order.
|
// in the correct order.
|
||||||
class SearchCardView : public views::View {
|
class SearchCardView : public views::View {
|
||||||
|
METADATA_HEADER(SearchCardView, views::View)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
METADATA_HEADER(SearchCardView);
|
|
||||||
explicit SearchCardView(std::unique_ptr<views::View> content_view) {
|
explicit SearchCardView(std::unique_ptr<views::View> content_view) {
|
||||||
SetLayoutManager(std::make_unique<views::FillLayout>());
|
SetLayoutManager(std::make_unique<views::FillLayout>());
|
||||||
AddChildView(std::move(content_view));
|
AddChildView(std::move(content_view));
|
||||||
@ -77,7 +78,7 @@ class SearchCardView : public views::View {
|
|||||||
~SearchCardView() override = default;
|
~SearchCardView() override = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
BEGIN_METADATA(SearchCardView, views::View)
|
BEGIN_METADATA(SearchCardView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
@ -1600,7 +1600,7 @@ bool SearchResultView::IsSearchResultHoveredOrSelected() {
|
|||||||
return IsMouseHovered() || selected();
|
return IsMouseHovered() || selected();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_METADATA(SearchResultView, SearchResultBaseView)
|
BEGIN_METADATA(SearchResultView)
|
||||||
END_METADATA
|
END_METADATA
|
||||||
|
|
||||||
} // namespace ash
|
} // namespace ash
|
||||||
|
@ -118,6 +118,8 @@ class SearchResultPageDialogController;
|
|||||||
|
|
||||||
class ASH_EXPORT SearchResultView : public SearchResultBaseView,
|
class ASH_EXPORT SearchResultView : public SearchResultBaseView,
|
||||||
public SearchResultActionsViewDelegate {
|
public SearchResultActionsViewDelegate {
|
||||||
|
METADATA_HEADER(SearchResultView, SearchResultBaseView)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
class LabelAndTag {
|
class LabelAndTag {
|
||||||
public:
|
public:
|
||||||
@ -152,7 +154,6 @@ class ASH_EXPORT SearchResultView : public SearchResultBaseView,
|
|||||||
kKeyboardShortcut,
|
kKeyboardShortcut,
|
||||||
};
|
};
|
||||||
|
|
||||||
METADATA_HEADER(SearchResultView);
|
|
||||||
SearchResultView(SearchResultListView* list_view,
|
SearchResultView(SearchResultListView* list_view,
|
||||||
AppListViewDelegate* view_delegate,
|
AppListViewDelegate* view_delegate,
|
||||||
SearchResultPageDialogController* dialog_controller,
|
SearchResultPageDialogController* dialog_controller,
|
||||||
|
Reference in New Issue
Block a user