Index: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h |
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h |
index 7a7d20bc9e764cfa3a73c6ef67e65f9cdc40f81d..110ca45719962f5c42d3cb5d693f78ec80d9502f 100644 |
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h |
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h |
@@ -6,12 +6,14 @@ |
#define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_ |
#pragma once |
+#include "base/basictypes.h" |
+#include "base/compiler_specific.h" |
#include "base/string16.h" |
#include "chrome/browser/bookmarks/recently_used_folders_combo_model.h" |
#include "googleurl/src/gurl.h" |
#include "ui/views/bubble/bubble_delegate.h" |
#include "views/controls/button/button.h" |
-#include "views/controls/combobox/combobox.h" |
+#include "views/controls/combobox/combobox_listener.h" |
#include "views/controls/link_listener.h" |
class Profile; |
@@ -28,7 +30,7 @@ class Textfield; |
class BookmarkBubbleView : public views::BubbleDelegateView, |
public views::LinkListener, |
public views::ButtonListener, |
- public views::Combobox::Listener { |
+ public views::ComboboxListener { |
public: |
static void ShowBubble(views::View* anchor_view, |
Profile* profile, |
@@ -65,16 +67,19 @@ class BookmarkBubbleView : public views::BubbleDelegateView, |
// Returns the title to display. |
string16 GetTitle(); |
- // views::LinkListener method, either unstars the item or shows the bookmark |
- // editor (depending upon which link was clicked). |
+ // Overridden from views::LinkListener: |
+ // Either unstars the item or shows the bookmark editor (depending upon which |
+ // link was clicked). |
virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; |
- // ButtonListener method, closes the bubble or opens the edit dialog. |
+ // Overridden from views::ButtonListener: |
+ // Closes the bubble or opens the edit dialog. |
virtual void ButtonPressed(views::Button* sender, |
const views::Event& event) OVERRIDE; |
- // Combobox::Listener method. Changes the parent of the bookmark. |
- virtual void ItemChanged(views::Combobox* combobox, |
+ // Overridden from views::ComboboxListener: |
+ // Changes the parent of the bookmark. |
+ virtual void ItemChanged(views::Combobox* combo_box, |
int prev_index, |
int new_index) OVERRIDE; |