Chromium Code Reviews| Index: chrome/browser/ui/views/simple_message_box_views.h |
| diff --git a/chrome/browser/ui/views/simple_message_box_views.h b/chrome/browser/ui/views/simple_message_box_views.h |
| index af21a5ad82a47dcdc3b1daf74e04e736de0f001b..5de3430e8940ae60f88c63afc66a6e337720206d 100644 |
| --- a/chrome/browser/ui/views/simple_message_box_views.h |
| +++ b/chrome/browser/ui/views/simple_message_box_views.h |
| @@ -29,7 +29,7 @@ class SimpleMessageBoxViews : public views::DialogDelegate, |
| const string16& message); |
| // Returns true if the Accept button was clicked. |
| - bool accepted() const { return disposition_ == DISPOSITION_OK; } |
| + bool accepted() const { return disposition_type_ == DISPOSITION_OK; } |
| private: |
| friend class base::RefCounted<SimpleMessageBoxViews>; |
| @@ -61,7 +61,7 @@ class SimpleMessageBoxViews : public views::DialogDelegate, |
| virtual const views::Widget* GetWidget() const OVERRIDE; |
| SimpleMessageBoxViews(gfx::NativeWindow parent_window, |
| - DialogType type, |
| + DialogType dialog_type, |
| const string16& title, |
| const string16& message); |
| virtual ~SimpleMessageBoxViews(); |
| @@ -71,10 +71,10 @@ class SimpleMessageBoxViews : public views::DialogDelegate, |
| // if the message is such that the menu should be closed. |
| virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE; |
| - const DialogType type_; |
| - string16 message_box_title_; |
| + const DialogType dialog_type_; |
| + DispositionType disposition_type_; |
|
Peter Kasting
2012/04/13 09:12:32
Nit: While it's not wrong, I don't think the |disp
|
| + const string16 window_title_; |
| views::MessageBoxView* message_box_view_; |
| - DispositionType disposition_; |
| DISALLOW_COPY_AND_ASSIGN(SimpleMessageBoxViews); |
| }; |