Commit d2865712 authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Commit Bot

assistant: add view class names

This helps with debugging view related issues.

Bug: None
Test: locally compile
Change-Id: I2a335e8eee149ee5c5d5e4549a8119290b34193b
Reviewed-on: https://chromium-review.googlesource.com/1227115Reviewed-by: default avatarMuyuan Li <muyuanli@chromium.org>
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592277}
parent 88dbe4b8
...@@ -195,6 +195,10 @@ void AssistantContainerView::OnlyAllowMouseClickEvents(aura::Window* window) { ...@@ -195,6 +195,10 @@ void AssistantContainerView::OnlyAllowMouseClickEvents(aura::Window* window) {
window->SetProperty(kOnlyAllowMouseClickEvents, true); window->SetProperty(kOnlyAllowMouseClickEvents, true);
} }
const char* AssistantContainerView::GetClassName() const {
return "AssistantContainerView";
}
void AssistantContainerView::AddedToWidget() { void AssistantContainerView::AddedToWidget() {
GetWidget()->GetNativeWindow()->SetEventTargeter( GetWidget()->GetNativeWindow()->SetEventTargeter(
std::make_unique<AssistantContainerEventTargeter>()); std::make_unique<AssistantContainerEventTargeter>());
......
...@@ -46,6 +46,7 @@ class AssistantContainerView : public views::BubbleDialogDelegateView, ...@@ -46,6 +46,7 @@ class AssistantContainerView : public views::BubbleDialogDelegateView,
static void OnlyAllowMouseClickEvents(aura::Window* window); static void OnlyAllowMouseClickEvents(aura::Window* window);
// views::BubbleDialogDelegateView: // views::BubbleDialogDelegateView:
const char* GetClassName() const override;
void AddedToWidget() override; void AddedToWidget() override;
int GetDialogButtons() const override; int GetDialogButtons() const override;
void ChildPreferredSizeChanged(views::View* child) override; void ChildPreferredSizeChanged(views::View* child) override;
......
...@@ -70,6 +70,10 @@ AssistantMainView::~AssistantMainView() { ...@@ -70,6 +70,10 @@ AssistantMainView::~AssistantMainView() {
assistant_controller_->ui_controller()->RemoveModelObserver(this); assistant_controller_->ui_controller()->RemoveModelObserver(this);
} }
const char* AssistantMainView::GetClassName() const {
return "AssistantMainView";
}
gfx::Size AssistantMainView::CalculatePreferredSize() const { gfx::Size AssistantMainView::CalculatePreferredSize() const {
return gfx::Size(kPreferredWidthDip, GetHeightForWidth(kPreferredWidthDip)); return gfx::Size(kPreferredWidthDip, GetHeightForWidth(kPreferredWidthDip));
} }
......
...@@ -22,6 +22,7 @@ class AssistantMainView : public views::View, public AssistantUiModelObserver { ...@@ -22,6 +22,7 @@ class AssistantMainView : public views::View, public AssistantUiModelObserver {
~AssistantMainView() override; ~AssistantMainView() override;
// views::View: // views::View:
const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
int GetHeightForWidth(int width) const override; int GetHeightForWidth(int width) const override;
void ChildPreferredSizeChanged(views::View* child) override; void ChildPreferredSizeChanged(views::View* child) override;
......
...@@ -51,6 +51,10 @@ AssistantMiniView::~AssistantMiniView() { ...@@ -51,6 +51,10 @@ AssistantMiniView::~AssistantMiniView() {
assistant_controller_->interaction_controller()->RemoveModelObserver(this); assistant_controller_->interaction_controller()->RemoveModelObserver(this);
} }
const char* AssistantMiniView::GetClassName() const {
return "AssistantMiniView";
}
gfx::Size AssistantMiniView::CalculatePreferredSize() const { gfx::Size AssistantMiniView::CalculatePreferredSize() const {
const int preferred_width = const int preferred_width =
std::min(views::View::CalculatePreferredSize().width(), kMaxWidthDip); std::min(views::View::CalculatePreferredSize().width(), kMaxWidthDip);
......
...@@ -43,6 +43,7 @@ class AssistantMiniView : public views::Button, ...@@ -43,6 +43,7 @@ class AssistantMiniView : public views::Button,
~AssistantMiniView() override; ~AssistantMiniView() override;
// views::View: // views::View:
const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
int GetHeightForWidth(int width) const override; int GetHeightForWidth(int width) const override;
void ChildPreferredSizeChanged(views::View* child) override; void ChildPreferredSizeChanged(views::View* child) override;
......
...@@ -42,6 +42,10 @@ AssistantWebView::~AssistantWebView() { ...@@ -42,6 +42,10 @@ AssistantWebView::~AssistantWebView() {
ReleaseWebContents(); ReleaseWebContents();
} }
const char* AssistantWebView::GetClassName() const {
return "AssistantWebView";
}
gfx::Size AssistantWebView::CalculatePreferredSize() const { gfx::Size AssistantWebView::CalculatePreferredSize() const {
return gfx::Size(kPreferredWidthDip, GetHeightForWidth(kPreferredWidthDip)); return gfx::Size(kPreferredWidthDip, GetHeightForWidth(kPreferredWidthDip));
} }
......
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
#ifndef ASH_ASSISTANT_UI_ASSISTANT_WEB_VIEW_H_ #ifndef ASH_ASSISTANT_UI_ASSISTANT_WEB_VIEW_H_
#define ASH_ASSISTANT_UI_ASSISTANT_WEB_VIEW_H_ #define ASH_ASSISTANT_UI_ASSISTANT_WEB_VIEW_H_
#include <map>
#include <memory> #include <memory>
#include <string>
#include "ash/assistant/assistant_controller_observer.h" #include "ash/assistant/assistant_controller_observer.h"
#include "ash/assistant/ui/caption_bar.h" #include "ash/assistant/ui/caption_bar.h"
...@@ -35,6 +37,7 @@ class AssistantWebView : public views::View, ...@@ -35,6 +37,7 @@ class AssistantWebView : public views::View,
~AssistantWebView() override; ~AssistantWebView() override;
// views::View: // views::View:
const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
int GetHeightForWidth(int width) const override; int GetHeightForWidth(int width) const override;
void ChildPreferredSizeChanged(views::View* child) override; void ChildPreferredSizeChanged(views::View* child) override;
......
...@@ -39,6 +39,10 @@ AssistantButton::AssistantButton(views::ButtonListener* listener) ...@@ -39,6 +39,10 @@ AssistantButton::AssistantButton(views::ButtonListener* listener)
AssistantButton::~AssistantButton() = default; AssistantButton::~AssistantButton() = default;
const char* AssistantButton::GetClassName() const {
return "AssistantButton";
}
void AssistantButton::OnBoundsChanged(const gfx::Rect& previous_bounds) { void AssistantButton::OnBoundsChanged(const gfx::Rect& previous_bounds) {
// Note that the current assumption is that button bounds are square. // Note that the current assumption is that button bounds are square.
DCHECK_EQ(width(), height()); DCHECK_EQ(width(), height());
......
...@@ -18,6 +18,7 @@ class AssistantButton : public views::ImageButton { ...@@ -18,6 +18,7 @@ class AssistantButton : public views::ImageButton {
~AssistantButton() override; ~AssistantButton() override;
// views::Button: // views::Button:
const char* GetClassName() const override;
void OnBoundsChanged(const gfx::Rect& previous_bounds) override; void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
std::unique_ptr<views::InkDrop> CreateInkDrop() override; std::unique_ptr<views::InkDrop> CreateInkDrop() override;
std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight() std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
......
...@@ -44,7 +44,8 @@ class ContentView : public views::View, views::ViewObserver { ...@@ -44,7 +44,8 @@ class ContentView : public views::View, views::ViewObserver {
class InvisibleScrollBar : public views::OverlayScrollBar { class InvisibleScrollBar : public views::OverlayScrollBar {
public: public:
InvisibleScrollBar(bool horizontal) : views::OverlayScrollBar(horizontal) {} explicit InvisibleScrollBar(bool horizontal)
: views::OverlayScrollBar(horizontal) {}
~InvisibleScrollBar() override = default; ~InvisibleScrollBar() override = default;
...@@ -65,6 +66,10 @@ AssistantScrollView::AssistantScrollView() { ...@@ -65,6 +66,10 @@ AssistantScrollView::AssistantScrollView() {
AssistantScrollView::~AssistantScrollView() = default; AssistantScrollView::~AssistantScrollView() = default;
const char* AssistantScrollView::GetClassName() const {
return "AssistantScrollView";
}
void AssistantScrollView::OnViewPreferredSizeChanged(views::View* view) { void AssistantScrollView::OnViewPreferredSizeChanged(views::View* view) {
OnContentsPreferredSizeChanged(content_view_); OnContentsPreferredSizeChanged(content_view_);
PreferredSizeChanged(); PreferredSizeChanged();
......
...@@ -16,6 +16,9 @@ class AssistantScrollView : public views::ScrollView, views::ViewObserver { ...@@ -16,6 +16,9 @@ class AssistantScrollView : public views::ScrollView, views::ViewObserver {
AssistantScrollView(); AssistantScrollView();
~AssistantScrollView() override; ~AssistantScrollView() override;
// views::ScrollView:
const char* GetClassName() const override;
// views::ViewObserver: // views::ViewObserver:
void OnViewPreferredSizeChanged(views::View* view) override; void OnViewPreferredSizeChanged(views::View* view) override;
......
...@@ -47,6 +47,10 @@ CaptionBar::CaptionBar() { ...@@ -47,6 +47,10 @@ CaptionBar::CaptionBar() {
CaptionBar::~CaptionBar() = default; CaptionBar::~CaptionBar() = default;
const char* CaptionBar::GetClassName() const {
return "CaptionBar";
}
bool CaptionBar::AcceleratorPressed(const ui::Accelerator& accelerator) { bool CaptionBar::AcceleratorPressed(const ui::Accelerator& accelerator) {
switch (accelerator.key_code()) { switch (accelerator.key_code()) {
case ui::VKEY_BROWSER_BACK: case ui::VKEY_BROWSER_BACK:
......
...@@ -39,6 +39,7 @@ class CaptionBar : public views::View, views::ButtonListener { ...@@ -39,6 +39,7 @@ class CaptionBar : public views::View, views::ButtonListener {
~CaptionBar() override; ~CaptionBar() override;
// views::View: // views::View:
const char* GetClassName() const override;
bool AcceleratorPressed(const ui::Accelerator& accelerator) override; bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
int GetHeightForWidth(int width) const override; int GetHeightForWidth(int width) const override;
......
...@@ -37,6 +37,10 @@ ActionView::~ActionView() { ...@@ -37,6 +37,10 @@ ActionView::~ActionView() {
assistant_controller_->interaction_controller()->RemoveModelObserver(this); assistant_controller_->interaction_controller()->RemoveModelObserver(this);
} }
const char* ActionView::GetClassName() const {
return "ActionView";
}
gfx::Size ActionView::CalculatePreferredSize() const { gfx::Size ActionView::CalculatePreferredSize() const {
return gfx::Size(kPreferredSizeDip, GetHeightForWidth(kPreferredSizeDip)); return gfx::Size(kPreferredSizeDip, GetHeightForWidth(kPreferredSizeDip));
} }
......
...@@ -24,7 +24,8 @@ class ActionView : public AssistantButton, ...@@ -24,7 +24,8 @@ class ActionView : public AssistantButton,
AssistantController* assistant_controller); AssistantController* assistant_controller);
~ActionView() override; ~ActionView() override;
// views::Button: // AssistantButton:
const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
int GetHeightForWidth(int width) const override; int GetHeightForWidth(int width) const override;
......
...@@ -92,6 +92,10 @@ void DialogPlate::RemoveObserver(DialogPlateObserver* observer) { ...@@ -92,6 +92,10 @@ void DialogPlate::RemoveObserver(DialogPlateObserver* observer) {
observers_.RemoveObserver(observer); observers_.RemoveObserver(observer);
} }
const char* DialogPlate::GetClassName() const {
return "DialogPlate";
}
gfx::Size DialogPlate::CalculatePreferredSize() const { gfx::Size DialogPlate::CalculatePreferredSize() const {
return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX)); return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
} }
......
...@@ -73,6 +73,7 @@ class DialogPlate : public views::View, ...@@ -73,6 +73,7 @@ class DialogPlate : public views::View,
void RemoveObserver(DialogPlateObserver* observer); void RemoveObserver(DialogPlateObserver* observer);
// views::View: // views::View:
const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
int GetHeightForWidth(int width) const override; int GetHeightForWidth(int width) const override;
void RequestFocus() override; void RequestFocus() override;
......
...@@ -45,6 +45,10 @@ LogoView::~LogoView() { ...@@ -45,6 +45,10 @@ LogoView::~LogoView() {
state_animator_.StopAnimator(); state_animator_.StopAnimator();
} }
const char* LogoView::GetClassName() const {
return "LogoView";
}
void LogoView::SetState(BaseLogoView::State state, bool animate) { void LogoView::SetState(BaseLogoView::State state, bool animate) {
StateModel::State animator_state; StateModel::State animator_state;
switch (state) { switch (state) {
......
...@@ -56,6 +56,7 @@ class LogoView : public BaseLogoView, ...@@ -56,6 +56,7 @@ class LogoView : public BaseLogoView,
~LogoView() override; ~LogoView() override;
// BaseLogoView: // BaseLogoView:
const char* GetClassName() const override;
void SetState(State state, bool animate) override; void SetState(State state, bool animate) override;
void SetSpeechLevel(float speech_level) override; void SetSpeechLevel(float speech_level) override;
......
...@@ -59,6 +59,10 @@ AssistantFooterView::AssistantFooterView( ...@@ -59,6 +59,10 @@ AssistantFooterView::AssistantFooterView(
AssistantFooterView::~AssistantFooterView() = default; AssistantFooterView::~AssistantFooterView() = default;
const char* AssistantFooterView::GetClassName() const {
return "AssistantFooterView";
}
gfx::Size AssistantFooterView::CalculatePreferredSize() const { gfx::Size AssistantFooterView::CalculatePreferredSize() const {
return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX)); return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
} }
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#define ASH_ASSISTANT_UI_MAIN_STAGE_ASSISTANT_FOOTER_VIEW_H_ #define ASH_ASSISTANT_UI_MAIN_STAGE_ASSISTANT_FOOTER_VIEW_H_
#include <memory> #include <memory>
#include <string>
#include "ash/public/interfaces/voice_interaction_controller.mojom.h" #include "ash/public/interfaces/voice_interaction_controller.mojom.h"
#include "base/macros.h" #include "base/macros.h"
...@@ -29,6 +30,7 @@ class AssistantFooterView : public views::View, ...@@ -29,6 +30,7 @@ class AssistantFooterView : public views::View,
~AssistantFooterView() override; ~AssistantFooterView() override;
// views::View: // views::View:
const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
int GetHeightForWidth(int width) const override; int GetHeightForWidth(int width) const override;
......
...@@ -67,6 +67,10 @@ AssistantHeaderView::~AssistantHeaderView() { ...@@ -67,6 +67,10 @@ AssistantHeaderView::~AssistantHeaderView() {
assistant_controller_->interaction_controller()->RemoveModelObserver(this); assistant_controller_->interaction_controller()->RemoveModelObserver(this);
} }
const char* AssistantHeaderView::GetClassName() const {
return "AssistantHeaderView";
}
gfx::Size AssistantHeaderView::CalculatePreferredSize() const { gfx::Size AssistantHeaderView::CalculatePreferredSize() const {
return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX)); return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
} }
......
...@@ -29,6 +29,7 @@ class AssistantHeaderView : public views::View, ...@@ -29,6 +29,7 @@ class AssistantHeaderView : public views::View,
~AssistantHeaderView() override; ~AssistantHeaderView() override;
// views::View: // views::View:
const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
void ChildVisibilityChanged(views::View* child) override; void ChildVisibilityChanged(views::View* child) override;
......
...@@ -226,6 +226,10 @@ AssistantMainStage::~AssistantMainStage() { ...@@ -226,6 +226,10 @@ AssistantMainStage::~AssistantMainStage() {
assistant_controller_->interaction_controller()->RemoveModelObserver(this); assistant_controller_->interaction_controller()->RemoveModelObserver(this);
} }
const char* AssistantMainStage::GetClassName() const {
return "AssistantMainStage";
}
void AssistantMainStage::ChildPreferredSizeChanged(views::View* child) { void AssistantMainStage::ChildPreferredSizeChanged(views::View* child) {
PreferredSizeChanged(); PreferredSizeChanged();
} }
......
...@@ -42,6 +42,7 @@ class AssistantMainStage : public views::View, ...@@ -42,6 +42,7 @@ class AssistantMainStage : public views::View,
~AssistantMainStage() override; ~AssistantMainStage() override;
// views::View: // views::View:
const char* GetClassName() const override;
void ChildPreferredSizeChanged(views::View* child) override; void ChildPreferredSizeChanged(views::View* child) override;
void ChildVisibilityChanged(views::View* child) override; void ChildVisibilityChanged(views::View* child) override;
......
...@@ -83,6 +83,10 @@ AssistantOptInView::AssistantOptInView() { ...@@ -83,6 +83,10 @@ AssistantOptInView::AssistantOptInView() {
AssistantOptInView::~AssistantOptInView() = default; AssistantOptInView::~AssistantOptInView() = default;
const char* AssistantOptInView::GetClassName() const {
return "AssistantOptInView";
}
void AssistantOptInView::ChildPreferredSizeChanged(views::View* child) { void AssistantOptInView::ChildPreferredSizeChanged(views::View* child) {
PreferredSizeChanged(); PreferredSizeChanged();
} }
......
...@@ -32,7 +32,8 @@ class AssistantOptInView : public views::View, public views::ButtonListener { ...@@ -32,7 +32,8 @@ class AssistantOptInView : public views::View, public views::ButtonListener {
AssistantOptInView(); AssistantOptInView();
~AssistantOptInView() override; ~AssistantOptInView() override;
// views::Button: // views::View:
const char* GetClassName() const override;
void ChildPreferredSizeChanged(views::View* child) override; void ChildPreferredSizeChanged(views::View* child) override;
void OnBoundsChanged(const gfx::Rect& previous_bounds) override; void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include "ash/assistant/ui/main_stage/assistant_progress_indicator.h" #include "ash/assistant/ui/main_stage/assistant_progress_indicator.h"
#include <algorithm>
#include "ash/assistant/util/animation_util.h" #include "ash/assistant/util/animation_util.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/time/time.h" #include "base/time/time.h"
...@@ -89,6 +91,10 @@ void AssistantProgressIndicator::InitLayout() { ...@@ -89,6 +91,10 @@ void AssistantProgressIndicator::InitLayout() {
} }
} }
const char* AssistantProgressIndicator::GetClassName() const {
return "AssistantProgressIndicator";
}
void AssistantProgressIndicator::AddedToWidget() { void AssistantProgressIndicator::AddedToWidget() {
VisibilityChanged(/*starting_from=*/this, /*is_visible=*/visible()); VisibilityChanged(/*starting_from=*/this, /*is_visible=*/visible());
} }
...@@ -118,7 +124,8 @@ void AssistantProgressIndicator::VisibilityChanged(views::View* starting_from, ...@@ -118,7 +124,8 @@ void AssistantProgressIndicator::VisibilityChanged(views::View* starting_from,
return; return;
} }
using namespace assistant::util; using assistant::util::CreateLayerAnimationSequence;
using assistant::util::CreateTransformElement;
// The animation performs scaling on the child views. In order to give the // The animation performs scaling on the child views. In order to give the
// illusion that scaling is being performed about the center of the view as // illusion that scaling is being performed about the center of the view as
...@@ -154,4 +161,4 @@ void AssistantProgressIndicator::VisibilityChanged(views::View* starting_from, ...@@ -154,4 +161,4 @@ void AssistantProgressIndicator::VisibilityChanged(views::View* starting_from,
} }
} }
} // namespace ash } // namespace ash
\ No newline at end of file
...@@ -18,6 +18,7 @@ class AssistantProgressIndicator : public views::View { ...@@ -18,6 +18,7 @@ class AssistantProgressIndicator : public views::View {
~AssistantProgressIndicator() override; ~AssistantProgressIndicator() override;
// views::View: // views::View:
const char* GetClassName() const override;
void AddedToWidget() override; void AddedToWidget() override;
void RemovedFromWidget() override; void RemovedFromWidget() override;
void OnLayerOpacityChanged(ui::PropertyChangeReason reason) override; void OnLayerOpacityChanged(ui::PropertyChangeReason reason) override;
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "ash/assistant/ui/main_stage/assistant_query_view.h" #include "ash/assistant/ui/main_stage/assistant_query_view.h"
#include <algorithm>
#include <memory> #include <memory>
#include "ash/assistant/model/assistant_query.h" #include "ash/assistant/model/assistant_query.h"
...@@ -40,6 +41,10 @@ AssistantQueryView::AssistantQueryView() { ...@@ -40,6 +41,10 @@ AssistantQueryView::AssistantQueryView() {
AssistantQueryView::~AssistantQueryView() = default; AssistantQueryView::~AssistantQueryView() = default;
const char* AssistantQueryView::GetClassName() const {
return "AssistantQueryView";
}
gfx::Size AssistantQueryView::CalculatePreferredSize() const { gfx::Size AssistantQueryView::CalculatePreferredSize() const {
return gfx::Size(kMaxWidthDip, GetHeightForWidth(kMaxWidthDip)); return gfx::Size(kMaxWidthDip, GetHeightForWidth(kMaxWidthDip));
} }
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
#ifndef ASH_ASSISTANT_UI_MAIN_STAGE_ASSISTANT_QUERY_VIEW_H_ #ifndef ASH_ASSISTANT_UI_MAIN_STAGE_ASSISTANT_QUERY_VIEW_H_
#define ASH_ASSISTANT_UI_MAIN_STAGE_ASSISTANT_QUERY_VIEW_H_ #define ASH_ASSISTANT_UI_MAIN_STAGE_ASSISTANT_QUERY_VIEW_H_
#include <string>
#include "base/macros.h" #include "base/macros.h"
#include "ui/views/controls/styled_label.h" #include "ui/views/controls/styled_label.h"
#include "ui/views/view.h" #include "ui/views/view.h"
...@@ -21,6 +23,7 @@ class AssistantQueryView : public views::View { ...@@ -21,6 +23,7 @@ class AssistantQueryView : public views::View {
~AssistantQueryView() override; ~AssistantQueryView() override;
// views::View: // views::View:
const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
int GetHeightForWidth(int width) const override; int GetHeightForWidth(int width) const override;
void ChildPreferredSizeChanged(views::View* child) override; void ChildPreferredSizeChanged(views::View* child) override;
......
...@@ -26,4 +26,8 @@ AssistantTextElementView::AssistantTextElementView( ...@@ -26,4 +26,8 @@ AssistantTextElementView::AssistantTextElementView(
AssistantTextElementView::~AssistantTextElementView() = default; AssistantTextElementView::~AssistantTextElementView() = default;
const char* AssistantTextElementView::GetClassName() const {
return "AssistantTextElementView";
}
} // namespace ash } // namespace ash
...@@ -19,6 +19,9 @@ class AssistantTextElementView : public views::Label { ...@@ -19,6 +19,9 @@ class AssistantTextElementView : public views::Label {
explicit AssistantTextElementView(const AssistantTextElement* text_element); explicit AssistantTextElementView(const AssistantTextElement* text_element);
~AssistantTextElementView() override; ~AssistantTextElementView() override;
// views::Label:
const char* GetClassName() const override;
private: private:
DISALLOW_COPY_AND_ASSIGN(AssistantTextElementView); DISALLOW_COPY_AND_ASSIGN(AssistantTextElementView);
}; };
......
...@@ -48,6 +48,10 @@ SuggestionContainerView::~SuggestionContainerView() { ...@@ -48,6 +48,10 @@ SuggestionContainerView::~SuggestionContainerView() {
assistant_controller_->cache_controller()->RemoveModelObserver(this); assistant_controller_->cache_controller()->RemoveModelObserver(this);
} }
const char* SuggestionContainerView::GetClassName() const {
return "SuggestionContainerView";
}
gfx::Size SuggestionContainerView::CalculatePreferredSize() const { gfx::Size SuggestionContainerView::CalculatePreferredSize() const {
return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX)); return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
} }
......
...@@ -41,6 +41,7 @@ class SuggestionContainerView : public AssistantScrollView, ...@@ -41,6 +41,7 @@ class SuggestionContainerView : public AssistantScrollView,
~SuggestionContainerView() override; ~SuggestionContainerView() override;
// AssistantScrollView: // AssistantScrollView:
const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
int GetHeightForWidth(int width) const override; int GetHeightForWidth(int width) const override;
void OnContentsPreferredSizeChanged(views::View* content_view) override; void OnContentsPreferredSizeChanged(views::View* content_view) override;
......
...@@ -231,6 +231,10 @@ UiElementContainerView::~UiElementContainerView() { ...@@ -231,6 +231,10 @@ UiElementContainerView::~UiElementContainerView() {
ReleaseAllCards(); ReleaseAllCards();
} }
const char* UiElementContainerView::GetClassName() const {
return "UiElementContainerView";
}
gfx::Size UiElementContainerView::CalculatePreferredSize() const { gfx::Size UiElementContainerView::CalculatePreferredSize() const {
return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX)); return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
} }
......
...@@ -38,6 +38,7 @@ class UiElementContainerView : public AssistantScrollView, ...@@ -38,6 +38,7 @@ class UiElementContainerView : public AssistantScrollView,
~UiElementContainerView() override; ~UiElementContainerView() override;
// AssistantScrollView: // AssistantScrollView:
const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
int GetHeightForWidth(int width) const override; int GetHeightForWidth(int width) const override;
void OnContentsPreferredSizeChanged(views::View* content_view) override; void OnContentsPreferredSizeChanged(views::View* content_view) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment