| Index: chrome/browser/ui/views/translate/translate_bubble_view.h
|
| diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h
|
| index 0e0f2d142efa74e84a5b13928afedcad392322e3..4f5b5b5b10401f9ef67951b40b18d69cdbdba1ab 100644
|
| --- a/chrome/browser/ui/views/translate/translate_bubble_view.h
|
| +++ b/chrome/browser/ui/views/translate/translate_bubble_view.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/basictypes.h"
|
| #include "chrome/browser/ui/translate/language_combobox_model.h"
|
| #include "chrome/browser/ui/translate/translate_bubble_model.h"
|
| +#include "chrome/browser/ui/translate/translate_denial_menu_model_observer.h"
|
| #include "ui/views/bubble/bubble_delegate.h"
|
| #include "ui/views/controls/button/button.h"
|
| #include "ui/views/controls/combobox/combobox_listener.h"
|
| @@ -29,13 +30,19 @@ class Checkbox;
|
| class GridLayout;
|
| class LabelButton;
|
| class Link;
|
| +class MultiTargetButton;
|
| class View;
|
| }
|
|
|
| +namespace ui {
|
| +class MenuModel;
|
| +}
|
| +
|
| class TranslateBubbleView : public views::BubbleDelegateView,
|
| public views::ButtonListener,
|
| public views::ComboboxListener,
|
| - public views::LinkListener {
|
| + public views::LinkListener,
|
| + public TranslateDenialMenuModelObserver {
|
| public:
|
| virtual ~TranslateBubbleView();
|
|
|
| @@ -71,6 +78,10 @@ class TranslateBubbleView : public views::BubbleDelegateView,
|
| // views::LinkListener method.
|
| virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
|
|
|
| + // TranslateDenialMenuModelObserver method.
|
| + virtual void OnExecutingDenialCommand(
|
| + TranslateDenialMenuModelObserver::Command command) OVERRIDE;
|
| +
|
| // Returns the current view state.
|
| TranslateBubbleModel::ViewState GetViewState() const;
|
|
|
| @@ -90,7 +101,6 @@ class TranslateBubbleView : public views::BubbleDelegateView,
|
| };
|
|
|
| enum ComboboxID {
|
| - COMBOBOX_ID_DENIAL,
|
| COMBOBOX_ID_SOURCE_LANGUAGE,
|
| COMBOBOX_ID_TARGET_LANGUAGE,
|
| };
|
| @@ -163,7 +173,9 @@ class TranslateBubbleView : public views::BubbleDelegateView,
|
| scoped_ptr<LanguageComboboxModel> source_language_combobox_model_;
|
| scoped_ptr<LanguageComboboxModel> target_language_combobox_model_;
|
|
|
| - views::Combobox* denial_combobox_;
|
| + scoped_ptr<ui::MenuModel> denial_button_model_;
|
| + views::MultiTargetButton* denial_button_;
|
| +
|
| views::Combobox* source_language_combobox_;
|
| views::Combobox* target_language_combobox_;
|
|
|
|
|