Commit c65114e5 authored by Shengsong Tan's avatar Shengsong Tan Committed by Chromium LUCI CQ

Adding metadata to IMEDetailedView

This is part of the "Views Posse" effort. See this document:
https://docs.google.com/document/d/1Rst3792TjXtVA8k8GXaPD8MnuB1JAneSOpIILdA4268/edit?usp=sharing

Bug: 1159562
Test: build
Change-Id: Iaf93f3d21f0b54d5afc10d3e9506cadc0d8fcd33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2601834Reviewed-by: default avatarAllen Bauer <kylixrd@chromium.org>
Reviewed-by: default avatarYoshiki Iguchi <yoshiki@chromium.org>
Commit-Queue: Shengsong Tan <sstan@google.com>
Cr-Commit-Position: refs/heads/master@{#840974}
parent 8218172b
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "ui/gfx/image/image.h" #include "ui/gfx/image/image.h"
#include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/paint_vector_icon.h"
#include "ui/views/controls/image_view.h" #include "ui/views/controls/image_view.h"
#include "ui/views/metadata/metadata_impl_macros.h"
namespace ash { namespace ash {
...@@ -78,9 +79,8 @@ void IMEDetailedView::ShowSettings() { ...@@ -78,9 +79,8 @@ void IMEDetailedView::ShowSettings() {
Shell::Get()->system_tray_model()->client()->ShowIMESettings(); Shell::Get()->system_tray_model()->client()->ShowIMESettings();
} }
const char* IMEDetailedView::GetClassName() const { BEGIN_METADATA(IMEDetailedView, ImeListView)
return "IMEDetailedView"; END_METADATA
}
} // namespace tray } // namespace tray
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "ash/public/cpp/ime_info.h" #include "ash/public/cpp/ime_info.h"
#include "ash/system/ime_menu/ime_list_view.h" #include "ash/system/ime_menu/ime_list_view.h"
#include "base/macros.h" #include "base/macros.h"
#include "ui/views/metadata/metadata_header_macros.h"
namespace views { namespace views {
class ImageView; class ImageView;
...@@ -25,8 +26,12 @@ namespace tray { ...@@ -25,8 +26,12 @@ namespace tray {
// enterprise-controlled icon). // enterprise-controlled icon).
class IMEDetailedView : public ImeListView { class IMEDetailedView : public ImeListView {
public: public:
METADATA_HEADER(IMEDetailedView);
IMEDetailedView(DetailedViewDelegate* delegate, IMEDetailedView(DetailedViewDelegate* delegate,
ImeControllerImpl* ime_controller); ImeControllerImpl* ime_controller);
IMEDetailedView(const IMEDetailedView&) = delete;
IMEDetailedView& operator=(const IMEDetailedView&) = delete;
~IMEDetailedView() override = default; ~IMEDetailedView() override = default;
void Update(const std::string& current_ime_id, void Update(const std::string& current_ime_id,
...@@ -44,7 +49,6 @@ class IMEDetailedView : public ImeListView { ...@@ -44,7 +49,6 @@ class IMEDetailedView : public ImeListView {
void ResetImeListView() override; void ResetImeListView() override;
void CreateExtraTitleRowButtons() override; void CreateExtraTitleRowButtons() override;
void ShowSettings(); void ShowSettings();
const char* GetClassName() const override;
ImeControllerImpl* const ime_controller_; ImeControllerImpl* const ime_controller_;
...@@ -53,8 +57,6 @@ class IMEDetailedView : public ImeListView { ...@@ -53,8 +57,6 @@ class IMEDetailedView : public ImeListView {
// This icon says that the IMEs are managed by policy. // This icon says that the IMEs are managed by policy.
views::ImageView* controlled_setting_icon_ = nullptr; views::ImageView* controlled_setting_icon_ = nullptr;
DISALLOW_COPY_AND_ASSIGN(IMEDetailedView);
}; };
} }
......
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