| Index: chrome/browser/ui/views/cookie_info_view.h
|
| diff --git a/chrome/browser/ui/views/cookie_info_view.h b/chrome/browser/ui/views/cookie_info_view.h
|
| index 0bc8e43bd5ac7f7bef05657c6a5fa333810e2505..90bd3ccff2e204d1659edc77ef86811c0586a50d 100644
|
| --- a/chrome/browser/ui/views/cookie_info_view.h
|
| +++ b/chrome/browser/ui/views/cookie_info_view.h
|
| @@ -9,10 +9,12 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "base/basictypes.h"
|
| +#include "base/compiler_specific.h"
|
| #include "base/string16.h"
|
| #include "net/base/cookie_monster.h"
|
| #include "ui/base/models/combobox_model.h"
|
| -#include "views/controls/combobox/combobox.h"
|
| +#include "views/controls/combobox/combobox_listener.h"
|
| #include "views/view.h"
|
|
|
| namespace views {
|
| @@ -38,7 +40,7 @@ class CookieInfoViewDelegate {
|
| //
|
| // Responsible for displaying a tabular grid of Cookie information.
|
| class CookieInfoView : public views::View,
|
| - public views::Combobox::Listener,
|
| + public views::ComboboxListener,
|
| public ui::ComboboxModel {
|
| public:
|
| explicit CookieInfoView(bool editable_expiration_date);
|
| @@ -61,19 +63,19 @@ class CookieInfoView : public views::View,
|
| void set_delegate(CookieInfoViewDelegate* delegate) { delegate_ = delegate; }
|
|
|
| protected:
|
| - // views::View overrides:
|
| + // views::View:
|
| virtual void ViewHierarchyChanged(bool is_add,
|
| views::View* parent,
|
| - views::View* child);
|
| + views::View* child) OVERRIDE;
|
|
|
| - // views::Combobox::Listener override.
|
| + // views::ComboboxListener:
|
| virtual void ItemChanged(views::Combobox* combo_box,
|
| int prev_index,
|
| - int new_index);
|
| + int new_index) OVERRIDE;
|
|
|
| - // ui::ComboboxModel overrides for expires_value_combobox_.
|
| - virtual int GetItemCount();
|
| - virtual string16 GetItemAt(int index);
|
| + // ui::ComboboxModel:
|
| + virtual int GetItemCount() OVERRIDE;
|
| + virtual string16 GetItemAt(int index) OVERRIDE;
|
|
|
| private:
|
| // Layout helper routines.
|
| @@ -119,4 +121,3 @@ class CookieInfoView : public views::View,
|
| };
|
|
|
| #endif // CHROME_BROWSER_UI_VIEWS_COOKIE_INFO_VIEW_H_
|
| -
|
|
|