Commit baa9a37e authored by Peter Kasting's avatar Peter Kasting Committed by Chromium LUCI CQ

Add metadata for classes in c/b/ui/views/qrcode_generator.

Bug: 1159562
Change-Id: Iad8ed010bb6ca7123f8a6a4fe2546712790a75ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2628084
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: default avatarAllen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843575}
parent d34ebf7e
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/textfield/textfield.h"
#include "ui/views/layout/grid_layout.h" #include "ui/views/layout/grid_layout.h"
#include "ui/views/layout/layout_provider.h" #include "ui/views/layout/layout_provider.h"
#include "ui/views/metadata/metadata_impl_macros.h"
#include "ui/views/view.h" #include "ui/views/view.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
...@@ -199,10 +200,6 @@ void QRCodeGeneratorBubble::WindowClosing() { ...@@ -199,10 +200,6 @@ void QRCodeGeneratorBubble::WindowClosing() {
} }
} }
const char* QRCodeGeneratorBubble::GetClassName() const {
return "QRCodeGeneratorBubble";
}
void QRCodeGeneratorBubble::Init() { void QRCodeGeneratorBubble::Init() {
// Requesting TEXT for trailing prevents extra padding at bottom of dialog. // Requesting TEXT for trailing prevents extra padding at bottom of dialog.
gfx::Insets insets = gfx::Insets insets =
...@@ -440,4 +437,7 @@ void QRCodeGeneratorBubble::DownloadButtonPressed() { ...@@ -440,4 +437,7 @@ void QRCodeGeneratorBubble::DownloadButtonPressed() {
base::RecordAction(base::UserMetricsAction("SharingQRCode.DownloadQRCode")); base::RecordAction(base::UserMetricsAction("SharingQRCode.DownloadQRCode"));
} }
BEGIN_METADATA(QRCodeGeneratorBubble, LocationBarBubbleDelegateView)
END_METADATA
} // namespace qrcode_generator } // namespace qrcode_generator
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
#include <memory> #include <memory>
#include "base/macros.h"
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_view.h" #include "chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_view.h"
#include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
#include "chrome/services/qrcode_generator/public/cpp/qrcode_generator_service.h" #include "chrome/services/qrcode_generator/public/cpp/qrcode_generator_service.h"
#include "ui/views/controls/label.h" #include "ui/views/controls/label.h"
#include "ui/views/controls/textfield/textfield_controller.h" #include "ui/views/controls/textfield/textfield_controller.h"
#include "ui/views/metadata/metadata_header_macros.h"
#include "url/gurl.h" #include "url/gurl.h"
namespace content { namespace content {
...@@ -40,10 +40,14 @@ class QRCodeGeneratorBubble : public QRCodeGeneratorBubbleView, ...@@ -40,10 +40,14 @@ class QRCodeGeneratorBubble : public QRCodeGeneratorBubbleView,
public LocationBarBubbleDelegateView, public LocationBarBubbleDelegateView,
public views::TextfieldController { public views::TextfieldController {
public: public:
METADATA_HEADER(QRCodeGeneratorBubble);
QRCodeGeneratorBubble(views::View* anchor_view, QRCodeGeneratorBubble(views::View* anchor_view,
content::WebContents* web_contents, content::WebContents* web_contents,
QRCodeGeneratorBubbleController* controller, QRCodeGeneratorBubbleController* controller,
const GURL& url); const GURL& url);
QRCodeGeneratorBubble(const QRCodeGeneratorBubble&) = delete;
QRCodeGeneratorBubble& operator=(const QRCodeGeneratorBubble&) = delete;
void Show(); void Show();
// QRCodeGeneratorBubbleView: // QRCodeGeneratorBubbleView:
...@@ -75,7 +79,6 @@ class QRCodeGeneratorBubble : public QRCodeGeneratorBubbleView, ...@@ -75,7 +79,6 @@ class QRCodeGeneratorBubble : public QRCodeGeneratorBubbleView,
View* GetInitiallyFocusedView() override; View* GetInitiallyFocusedView() override;
bool ShouldShowCloseButton() const override; bool ShouldShowCloseButton() const override;
void WindowClosing() override; void WindowClosing() override;
const char* GetClassName() const override;
// views::BubbleDialogDelegateView: // views::BubbleDialogDelegateView:
void Init() override; void Init() override;
...@@ -110,8 +113,6 @@ class QRCodeGeneratorBubble : public QRCodeGeneratorBubbleView, ...@@ -110,8 +113,6 @@ class QRCodeGeneratorBubble : public QRCodeGeneratorBubbleView,
QRCodeGeneratorBubbleController* controller_; // weak. QRCodeGeneratorBubbleController* controller_; // weak.
content::WebContents* web_contents_; // weak. content::WebContents* web_contents_; // weak.
DISALLOW_COPY_AND_ASSIGN(QRCodeGeneratorBubble);
}; };
} // namespace qrcode_generator } // namespace qrcode_generator
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "components/omnibox/browser/omnibox_view.h" #include "components/omnibox/browser/omnibox_view.h"
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "ui/views/metadata/metadata_impl_macros.h"
namespace qrcode_generator { namespace qrcode_generator {
...@@ -88,10 +89,6 @@ const gfx::VectorIcon& QRCodeGeneratorIconView::GetVectorIcon() const { ...@@ -88,10 +89,6 @@ const gfx::VectorIcon& QRCodeGeneratorIconView::GetVectorIcon() const {
return kQrcodeGeneratorIcon; return kQrcodeGeneratorIcon;
} }
const char* QRCodeGeneratorIconView::GetClassName() const {
return "QRCodeGeneratorIconView";
}
base::string16 QRCodeGeneratorIconView::GetTextForTooltipAndAccessibleName() base::string16 QRCodeGeneratorIconView::GetTextForTooltipAndAccessibleName()
const { const {
return l10n_util::GetStringUTF16(IDS_OMNIBOX_QRCODE_GENERATOR_ICON_TOOLTIP); return l10n_util::GetStringUTF16(IDS_OMNIBOX_QRCODE_GENERATOR_ICON_TOOLTIP);
...@@ -101,4 +98,7 @@ bool QRCodeGeneratorIconView::ShouldShowLabel() const { ...@@ -101,4 +98,7 @@ bool QRCodeGeneratorIconView::ShouldShowLabel() const {
return false; return false;
} }
BEGIN_METADATA(QRCodeGeneratorIconView, PageActionIconView)
END_METADATA
} // namespace qrcode_generator } // namespace qrcode_generator
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#ifndef CHROME_BROWSER_UI_VIEWS_QRCODE_GENERATOR_QRCODE_GENERATOR_ICON_VIEW_H_ #ifndef CHROME_BROWSER_UI_VIEWS_QRCODE_GENERATOR_QRCODE_GENERATOR_ICON_VIEW_H_
#define CHROME_BROWSER_UI_VIEWS_QRCODE_GENERATOR_QRCODE_GENERATOR_ICON_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_QRCODE_GENERATOR_QRCODE_GENERATOR_ICON_VIEW_H_
#include "base/macros.h"
#include "chrome/browser/ui/views/page_action/page_action_icon_view.h" #include "chrome/browser/ui/views/page_action/page_action_icon_view.h"
#include "ui/views/metadata/metadata_header_macros.h"
class CommandUpdater; class CommandUpdater;
...@@ -16,10 +16,13 @@ namespace qrcode_generator { ...@@ -16,10 +16,13 @@ namespace qrcode_generator {
// can generate a QR code for the current page or a selected image. // can generate a QR code for the current page or a selected image.
class QRCodeGeneratorIconView : public PageActionIconView { class QRCodeGeneratorIconView : public PageActionIconView {
public: public:
METADATA_HEADER(QRCodeGeneratorIconView);
QRCodeGeneratorIconView( QRCodeGeneratorIconView(
CommandUpdater* command_updater, CommandUpdater* command_updater,
IconLabelBubbleView::Delegate* icon_label_bubble_delegate, IconLabelBubbleView::Delegate* icon_label_bubble_delegate,
PageActionIconView::Delegate* page_action_icon_delegate); PageActionIconView::Delegate* page_action_icon_delegate);
QRCodeGeneratorIconView(const QRCodeGeneratorIconView&) = delete;
QRCodeGeneratorIconView& operator=(const QRCodeGeneratorIconView&) = delete;
~QRCodeGeneratorIconView() override; ~QRCodeGeneratorIconView() override;
// PageActionIconView: // PageActionIconView:
...@@ -32,14 +35,11 @@ class QRCodeGeneratorIconView : public PageActionIconView { ...@@ -32,14 +35,11 @@ class QRCodeGeneratorIconView : public PageActionIconView {
// PageActionIconView: // PageActionIconView:
void OnExecuting(PageActionIconView::ExecuteSource execute_source) override; void OnExecuting(PageActionIconView::ExecuteSource execute_source) override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
const char* GetClassName() const override;
private: private:
// Flag set when OnExecuting() is called and cleared after bubble is created. // Flag set when OnExecuting() is called and cleared after bubble is created.
// Avoids losing ink drop on, or flickering, the PageActionIconView. // Avoids losing ink drop on, or flickering, the PageActionIconView.
bool bubble_requested_; bool bubble_requested_;
DISALLOW_COPY_AND_ASSIGN(QRCodeGeneratorIconView);
}; };
} // namespace qrcode_generator } // namespace qrcode_generator
......
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